From c01ca803281c3440d204b8bed9c388b246a98650 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Fri, 2 May 2008 09:43:13 +0000 Subject: [PATCH] Revert 9499, genone merged and improved it in 10082 svn path=/main/branches/prefix/; revision=10084 --- pym/portage/dbapi/vartree.py | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index eb4795f6a..0cdf7c8fc 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -1278,34 +1278,7 @@ class dblink(object): plib_dict = plib_registry.getPreservedLibs() for cpv in plib_dict: keeplist = [] - - # for the loop below to work correctly, we need all - # symlinks to come before the actual files, such that - # the recorded symlinks (sonames) will be resolved into - # their real target before the object is found not to be - # in the reverse NEEDED map - def symlink_compare(x, y): - if not os.path.exists(x): - if not os.path.exists(y): - return 0 - else: - return -1 - else: - if not os.path.exists(y): - return 1 - else: - if os.path.islink(x): - if os.path.islink(y): - return 0 - else: - return -1 - else: - if os.path.islink(y): - return 1 - else: - return 0 - - plib_dict[cpv].sort(symlink_compare) + plib_dict[cpv].sort() for f in plib_dict[cpv]: if not os.path.exists(f) or os.path.realpath(f) in keeplist: continue -- 2.26.2