Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/dbapi/
Date: Wed, 29 Jun 2011 11:37:54
Message-Id: df4641613d30945c5cb6b1287946dcdb7acf151e.zmedico@gentoo
1 commit: df4641613d30945c5cb6b1287946dcdb7acf151e
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jun 29 11:37:08 2011 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 29 11:37:08 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=df464161
7
8 preserve-libs: don't preserve "master" symlink
9
10 There's no point in preserving the "master" symlink, since the soname
11 symlink is all that's strictly required.
12
13 ---
14 pym/portage/dbapi/vartree.py | 5 ++++-
15 1 files changed, 4 insertions(+), 1 deletions(-)
16
17 diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
18 index eacada6..b3e6f6a 100644
19 --- a/pym/portage/dbapi/vartree.py
20 +++ b/pym/portage/dbapi/vartree.py
21 @@ -2476,7 +2476,10 @@ class dblink(object):
22 continue
23
24 if have_lib:
25 - preserve_paths.update(preserve_node.alt_paths)
26 + # There's no point in preserving the "master" symlink, since
27 + # the soname symlink is all that's strictly required.
28 + preserve_paths.update(f for f in preserve_node.alt_paths
29 + if not linkmap.isMasterLink(f))
30
31 return preserve_paths