diff options
| author | Jason Stubbs <jstubbs@gentoo.org> | 2005-12-21 14:48:56 +0000 |
|---|---|---|
| committer | Jason Stubbs <jstubbs@gentoo.org> | 2005-12-21 14:48:56 +0000 |
| commit | b1c96790b571aed15d126e9e48a4a4b972365892 (patch) | |
| tree | 9460a40f3d369cf77c1e738b3e1fe138e99dbe48 /pym | |
| parent | 27d129da700aca1be8a8bf7fa26276169486dbf1 (diff) | |
| download | portage-b1c96790b571aed15d126e9e48a4a4b972365892.tar.gz portage-b1c96790b571aed15d126e9e48a4a4b972365892.tar.bz2 portage-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 'pym')
| -rw-r--r-- | pym/getbinpkg.py | 5 | ||||
| -rw-r--r-- | pym/portage.py | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pym/getbinpkg.py b/pym/getbinpkg.py index b74fa04d9..ccffc1dd2 100644 --- a/pym/getbinpkg.py +++ b/pym/getbinpkg.py @@ -362,7 +362,10 @@ def file_get(baseurl,dest,conn=None,fcmd=None): myargs = [os.path.basename(mycmd)]+mysplit[1:] mypid=os.fork() if mypid == 0: - os.execv(mycmd,myargs) + try: + os.execv(mycmd,myargs) + except OSError: + pass sys.stderr.write("!!! Failed to spawn fetcher.\n") sys.exit(1) retval=os.waitpid(mypid,0)[1] diff --git a/pym/portage.py b/pym/portage.py index 3d2058f15..09a8504bd 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -5442,8 +5442,7 @@ class binarytree(packagetree): raise except: pass - getbinpkg.file_get(settings["PORTAGE_BINHOST"]+"/"+tbz2name, mydest, fcmd=settings["RESUMECOMMAND"]) - return + return getbinpkg.file_get(settings["PORTAGE_BINHOST"]+"/"+tbz2name, mydest, fcmd=settings["RESUMECOMMAND"]) def getslot(self,mycatpkg): "Get a slot for a catpkg; assume it exists." |