From: Fabian Groffen <grobian@gentoo.org>
Date: Sun, 19 Dec 2010 15:46:06 +0000 (+0100)
Subject: Merge remote branch 'overlays-gentoo-org/master' into prefix
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b7b86e952c510ad5c24cedb96252aacee7763730;p=portage.git

Merge remote branch 'overlays-gentoo-org/master' into prefix
---

b7b86e952c510ad5c24cedb96252aacee7763730
diff --cc pym/portage/getbinpkg.py
index 7c161b541,f85b65c00..1e886e513
--- a/pym/portage/getbinpkg.py
+++ b/pym/portage/getbinpkg.py
@@@ -15,9 -15,8 +15,9 @@@ import socke
  import time
  import tempfile
  import base64
 +from portage.const import CACHE_PATH
  
- _all_errors = [ValueError, socket.error]
+ _all_errors = [NotImplementedError, ValueError, socket.error]
  
  try:
  	from html.parser import HTMLParser as html_parser_HTMLParser