| 1 |
Author: grobian |
| 2 |
Date: 2008-05-02 09:43:13 +0000 (Fri, 02 May 2008) |
| 3 |
New Revision: 10084 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/prefix/pym/portage/dbapi/vartree.py |
| 7 |
Log: |
| 8 |
Revert 9499, genone merged and improved it in 10082 |
| 9 |
|
| 10 |
|
| 11 |
|
| 12 |
Modified: main/branches/prefix/pym/portage/dbapi/vartree.py |
| 13 |
=================================================================== |
| 14 |
--- main/branches/prefix/pym/portage/dbapi/vartree.py 2008-05-02 09:35:56 UTC (rev 10083) |
| 15 |
+++ main/branches/prefix/pym/portage/dbapi/vartree.py 2008-05-02 09:43:13 UTC (rev 10084) |
| 16 |
@@ -1278,34 +1278,7 @@ |
| 17 |
plib_dict = plib_registry.getPreservedLibs() |
| 18 |
for cpv in plib_dict: |
| 19 |
keeplist = [] |
| 20 |
- |
| 21 |
- # for the loop below to work correctly, we need all |
| 22 |
- # symlinks to come before the actual files, such that |
| 23 |
- # the recorded symlinks (sonames) will be resolved into |
| 24 |
- # their real target before the object is found not to be |
| 25 |
- # in the reverse NEEDED map |
| 26 |
- def symlink_compare(x, y): |
| 27 |
- if not os.path.exists(x): |
| 28 |
- if not os.path.exists(y): |
| 29 |
- return 0 |
| 30 |
- else: |
| 31 |
- return -1 |
| 32 |
- else: |
| 33 |
- if not os.path.exists(y): |
| 34 |
- return 1 |
| 35 |
- else: |
| 36 |
- if os.path.islink(x): |
| 37 |
- if os.path.islink(y): |
| 38 |
- return 0 |
| 39 |
- else: |
| 40 |
- return -1 |
| 41 |
- else: |
| 42 |
- if os.path.islink(y): |
| 43 |
- return 1 |
| 44 |
- else: |
| 45 |
- return 0 |
| 46 |
- |
| 47 |
- plib_dict[cpv].sort(symlink_compare) |
| 48 |
+ plib_dict[cpv].sort() |
| 49 |
for f in plib_dict[cpv]: |
| 50 |
if not os.path.exists(f) or os.path.realpath(f) in keeplist: |
| 51 |
continue |
| 52 |
|
| 53 |
-- |
| 54 |
gentoo-commits@l.g.o mailing list |
Archives