Revert 9499, genone merged and improved it in 10082

svn path=/main/branches/prefix/; revision=10084

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index eb4795f6a889da6a1ac4cb296108392818dfaf58..0cdf7c8fc56cf3814d9244898b95db44293add45 100644 (file)
--- 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