diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2008-11-01 07:22:49 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-11-01 07:22:49 +0000 |
| commit | 3c548c68cbd575ba9359ba080b0beb074a0e7d42 (patch) | |
| tree | f67a8a1d8dad93c9ed9524fc0cdc5a082d1a6416 | |
| parent | Also call PreservedLibsRegistry.pruneNonExisting() after obtaining a lock (diff) | |
| download | portage-multirepo-3c548c68cbd575ba9359ba080b0beb074a0e7d42.tar.gz portage-multirepo-3c548c68cbd575ba9359ba080b0beb074a0e7d42.tar.bz2 portage-multirepo-3c548c68cbd575ba9359ba080b0beb074a0e7d42.zip | |
Remove unnecessary handler for plain "Exception" from lstat() call in
dblink.mergeme().
svn path=/main/trunk/; revision=11781
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index c2403917..fe45e3b4 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -3481,16 +3481,6 @@ class dblink(object): writemsg(red("!!! File: ")+str(mysrc)+"\n", noiselevel=-1) writemsg(red("!!! Error: ")+str(e)+"\n", noiselevel=-1) return 1 - except Exception, e: - writemsg("\n") - writemsg(red("!!! ERROR: An unknown error has occurred during the merge process.\n")) - writemsg(red("!!! A stat call returned the following error for the following file:")) - writemsg( "!!! Please ensure that your filesystem is intact, otherwise report\n") - writemsg( "!!! this as a portage bug at bugs.gentoo.org. Append 'emerge info'.\n") - writemsg( "!!! File: "+str(mysrc)+"\n", noiselevel=-1) - writemsg( "!!! Error: "+str(e)+"\n", noiselevel=-1) - return 1 - mymode = mystat[stat.ST_MODE] # handy variables; mydest is the target object on the live filesystems; |