| 1 |
Author: zmedico |
| 2 |
Date: 2008-04-02 18:03:08 +0000 (Wed, 02 Apr 2008) |
| 3 |
New Revision: 9677 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/util.py |
| 7 |
Log: |
| 8 |
Handle a potential FileNotFound exception in new_protect_filename() when |
| 9 |
the last ._cfg* file happens to be a broken symlink. Thanks to bonsaikitten |
| 10 |
for reporting. |
| 11 |
|
| 12 |
|
| 13 |
Modified: main/trunk/pym/portage/util.py |
| 14 |
=================================================================== |
| 15 |
--- main/trunk/pym/portage/util.py 2008-04-01 23:37:34 UTC (rev 9676) |
| 16 |
+++ main/trunk/pym/portage/util.py 2008-04-02 18:03:08 UTC (rev 9677) |
| 17 |
@@ -1072,9 +1072,15 @@ |
| 18 |
old_pfile = normalize_path(os.path.join(real_dirname, last_pfile)) |
| 19 |
if last_pfile and newmd5: |
| 20 |
import portage.checksum |
| 21 |
- if portage.checksum.perform_md5( |
| 22 |
- os.path.join(real_dirname, last_pfile)) == newmd5: |
| 23 |
- return old_pfile |
| 24 |
+ try: |
| 25 |
+ last_pfile_md5 = portage.checksum.perform_md5( |
| 26 |
+ os.path.join(real_dirname, last_pfile)) |
| 27 |
+ except FileNotFound: |
| 28 |
+ # The file suddenly disappeared or it's a broken symlink. |
| 29 |
+ pass |
| 30 |
+ else: |
| 31 |
+ if last_pfile_md5 == newmd5: |
| 32 |
+ return old_pfile |
| 33 |
return new_pfile |
| 34 |
|
| 35 |
def getlibpaths(): |
| 36 |
|
| 37 |
-- |
| 38 |
gentoo-commits@l.g.o mailing list |
Archives