preserve-libs: don't preserve "master" symlink
authorZac Medico <zmedico@gentoo.org>
Wed, 29 Jun 2011 11:37:08 +0000 (04:37 -0700)
committerZac Medico <zmedico@gentoo.org>
Wed, 29 Jun 2011 11:37:08 +0000 (04:37 -0700)
There's no point in preserving the "master" symlink, since the soname
symlink is all that's strictly required.

pym/portage/dbapi/vartree.py

index eacada6b323cbe00162a336c2f79428c0fe691a1..b3e6f6a62a0499a980410c69c336468e3600c026 100644 (file)
@@ -2476,7 +2476,10 @@ class dblink(object):
                                        continue
 
                        if have_lib:
-                               preserve_paths.update(preserve_node.alt_paths)
+                               # There's no point in preserving the "master" symlink, since
+                               # the soname symlink is all that's strictly required.
+                               preserve_paths.update(f for f in preserve_node.alt_paths
+                                       if not linkmap.isMasterLink(f))
 
                return preserve_paths