From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Qbt5e-0008Te-Ow for garchives@archives.gentoo.org; Wed, 29 Jun 2011 11:37:54 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F39EA1C02E; Wed, 29 Jun 2011 11:37:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C397B1C02E for ; Wed, 29 Jun 2011 11:37:46 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2603E2AC008 for ; Wed, 29 Jun 2011 11:37:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 348598003C for ; Wed, 29 Jun 2011 11:37:44 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/dbapi/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/dbapi/vartree.py X-VCS-Directories: pym/portage/dbapi/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: df4641613d30945c5cb6b1287946dcdb7acf151e Date: Wed, 29 Jun 2011 11:37:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: cf51005979effef961a8c95f97b58bed commit: df4641613d30945c5cb6b1287946dcdb7acf151e Author: Zac Medico gentoo org> AuthorDate: Wed Jun 29 11:37:08 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Jun 29 11:37:08 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Ddf464161 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. --- pym/portage/dbapi/vartree.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index eacada6..b3e6f6a 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -2476,7 +2476,10 @@ class dblink(object): continue =20 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)) =20 return preserve_paths =20