Index: parallel_emerge |
diff --git a/parallel_emerge b/parallel_emerge |
index 930f53dcd6f1982d92000cb2a74421378182ecb8..8aa76400be290e97ef23c87cd7fbd7ebf54b9e4f 100755 |
--- a/parallel_emerge |
+++ b/parallel_emerge |
@@ -741,15 +741,13 @@ class DepGraphGenerator(object): |
try: |
return urllib2.urlopen(url) |
except urllib2.HTTPError as e: |
+ print "Cannot GET %s: %s" % (url, str(e)) |
if i + 1 >= tries or e.code < 500: |
raise |
- else: |
- print "Cannot GET %s: %s" % (url, str(e)) |
except urllib2.URLError as e: |
+ print "Cannot GET %s: %s" % (url, str(e)) |
if i + 1 >= tries: |
raise |
- else: |
- print "Cannot GET %s: %s" % (url, str(e)) |
print "Sleeping for 10 seconds before retrying..." |
time.sleep(10) |
@@ -1837,7 +1835,11 @@ def main(): |
remote_pkgs = {} |
if "--getbinpkg" in emerge.opts: |
binhost = emerge.settings["PORTAGE_BINHOST"] |
- remote_pkgs = deps.RemotePackageDatabase(binhost) |
+ try: |
+ remote_pkgs = deps.RemotePackageDatabase(binhost) |
+ except (urllib2.HTTPError, urllib2.URLError): |
+ print "Cannot resolve binhost. Building from source..." |
Nick Sanders
2010/12/21 01:32:31
Can we print like 10 lines of **********'s here an
|
+ del emerge.opts["--getbinpkg"] |
deps_tree, deps_info = deps.GenDependencyTree(remote_pkgs) |