summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-06-29 04:37:08 -0700
committerZac Medico <zmedico@gentoo.org>2011-06-29 04:37:08 -0700
commitdf4641613d30945c5cb6b1287946dcdb7acf151e (patch)
tree3e5ec12e81b12be001102d4f22019ada8580aa78
parente1347f9c0dd5ef5ff1a50d6b136b0648efb8a6ca (diff)
downloadportage-df4641613d30945c5cb6b1287946dcdb7acf151e.tar.gz
portage-df4641613d30945c5cb6b1287946dcdb7acf151e.tar.bz2
portage-df4641613d30945c5cb6b1287946dcdb7acf151e.zip
preserve-libs: don't preserve "master" symlink
There's no point in preserving the "master" symlink, since the soname symlink is all that's strictly required.
-rw-r--r--pym/portage/dbapi/vartree.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index eacada6b3..b3e6f6a62 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -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