From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 29 Jun 2011 11:37:08 +0000 (-0700)
Subject: preserve-libs: don't preserve "master" symlink
X-Git-Tag: v2.2.0_alpha42~20
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=df4641613d30945c5cb6b1287946dcdb7acf151e;p=portage.git

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.
---

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