| 1 |
Author: zmedico |
| 2 |
Date: 2008-11-01 07:22:49 +0000 (Sat, 01 Nov 2008) |
| 3 |
New Revision: 11781 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/dbapi/vartree.py |
| 7 |
Log: |
| 8 |
Remove unnecessary handler for plain "Exception" from lstat() call in |
| 9 |
dblink.mergeme(). |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/portage/dbapi/vartree.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/portage/dbapi/vartree.py 2008-11-01 07:09:19 UTC (rev 11780) |
| 15 |
+++ main/trunk/pym/portage/dbapi/vartree.py 2008-11-01 07:22:49 UTC (rev 11781) |
| 16 |
@@ -3481,17 +3481,7 @@ |
| 17 |
writemsg(red("!!! File: ")+str(mysrc)+"\n", noiselevel=-1) |
| 18 |
writemsg(red("!!! Error: ")+str(e)+"\n", noiselevel=-1) |
| 19 |
return 1 |
| 20 |
- except Exception, e: |
| 21 |
- writemsg("\n") |
| 22 |
- writemsg(red("!!! ERROR: An unknown error has occurred during the merge process.\n")) |
| 23 |
- writemsg(red("!!! A stat call returned the following error for the following file:")) |
| 24 |
- writemsg( "!!! Please ensure that your filesystem is intact, otherwise report\n") |
| 25 |
- writemsg( "!!! this as a portage bug at bugs.gentoo.org. Append 'emerge info'.\n") |
| 26 |
- writemsg( "!!! File: "+str(mysrc)+"\n", noiselevel=-1) |
| 27 |
- writemsg( "!!! Error: "+str(e)+"\n", noiselevel=-1) |
| 28 |
- return 1 |
| 29 |
|
| 30 |
- |
| 31 |
mymode = mystat[stat.ST_MODE] |
| 32 |
# handy variables; mydest is the target object on the live filesystems; |
| 33 |
# mysrc is the source object in the temporary install dir |
Archives