summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorJason Stubbs <jstubbs@gentoo.org>2005-12-21 14:48:56 +0000
committerJason Stubbs <jstubbs@gentoo.org>2005-12-21 14:48:56 +0000
commitb1c96790b571aed15d126e9e48a4a4b972365892 (patch)
tree9460a40f3d369cf77c1e738b3e1fe138e99dbe48 /bin
parentFix an incorrect positional check in *DEPEND parsing. (diff)
downloadportage-multirepo-b1c96790b571aed15d126e9e48a4a4b972365892.tar.gz
portage-multirepo-b1c96790b571aed15d126e9e48a4a4b972365892.tar.bz2
portage-multirepo-b1c96790b571aed15d126e9e48a4a4b972365892.zip
Prevent traceback on fetcher failure and properly check for error conditions
when fetching remote binary packages. #116276 svn path=/main/trunk/; revision=2419
Diffstat (limited to 'bin')
-rwxr-xr-xbin/emerge3
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/emerge b/bin/emerge
index d9f18b23..e4f51097 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -2037,7 +2037,8 @@ class depgraph:
if portage.db[portage.root]["bintree"].isremote(x[2]):
short_msg = "emerge: ("+str(mergecount)+" of "+str(len(mymergelist))+") "+x[pkgindex]+" Fetch"
emergelog(" --- ("+str(mergecount)+" of "+str(len(mymergelist))+") Fetching Binary ("+x[pkgindex]+"::"+mytbz2+")", short_msg=short_msg)
- portage.db[portage.root]["bintree"].gettbz2(x[2])
+ if not portage.db[portage.root]["bintree"].gettbz2(x[2]):
+ sys.exit(1)
if ("--fetchonly" in myopts) or ("--fetch-all-uri" in myopts):
continue