Merge remote branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Sun, 19 Dec 2010 15:46:06 +0000 (16:46 +0100)
committerFabian Groffen <grobian@gentoo.org>
Sun, 19 Dec 2010 15:46:06 +0000 (16:46 +0100)
1  2 
bin/repoman
pym/portage/getbinpkg.py

diff --cc bin/repoman
Simple merge
index 7c161b541a89c5be50c08e1c6382d150f2c23257,f85b65c00a5303b103e1ac516fb7c263d6b4d853..1e886e5135faa9f99295c0f6d15229b8b766cb65
@@@ -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