| 1 |
Author: zmedico |
| 2 |
Date: 2008-06-23 01:24:25 +0000 (Mon, 23 Jun 2008) |
| 3 |
New Revision: 10762 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/dbapi/vartree.py |
| 7 |
Log: |
| 8 |
Bug #228977 - Protect against possible infinite loop in |
| 9 |
dblink._preserve_libs(). |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/portage/dbapi/vartree.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/portage/dbapi/vartree.py 2008-06-22 23:15:19 UTC (rev 10761) |
| 15 |
+++ main/trunk/pym/portage/dbapi/vartree.py 2008-06-23 01:24:25 UTC (rev 10762) |
| 16 |
@@ -2068,8 +2068,9 @@ |
| 17 |
os.symlink(linktarget, os.path.join(srcroot, x.lstrip(os.sep))) |
| 18 |
if linktarget[0] != os.sep: |
| 19 |
linktarget = os.path.join(os.path.dirname(x), linktarget) |
| 20 |
- candidates.add(linktarget) |
| 21 |
- candidates_stack.append(linktarget) |
| 22 |
+ if linktarget not in candidates: |
| 23 |
+ candidates.add(linktarget) |
| 24 |
+ candidates_stack.append(linktarget) |
| 25 |
else: |
| 26 |
shutil.copy2(os.path.join(destroot, x.lstrip(os.sep)), |
| 27 |
os.path.join(srcroot, x.lstrip(os.sep))) |
| 28 |
|
| 29 |
-- |
| 30 |
gentoo-commits@l.g.o mailing list |
Archives