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 1QJAwf-0000Yb-5C for garchives@archives.gentoo.org; Sun, 08 May 2011 20:51:17 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F12121C062; Sun, 8 May 2011 20:50:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B361A1C062 for ; Sun, 8 May 2011 20:50:14 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 709711B4084 for ; Sun, 8 May 2011 20:50:14 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id CF31645C51 for ; Sun, 8 May 2011 20:50:13 +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:2.1.9 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: e32d4fc7d06831bc52200d0bef9cedbbdae3d548 Date: Sun, 8 May 2011 20:50:13 +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: 8deab5f51f8f5ae705ec1870594cdd69 commit: e32d4fc7d06831bc52200d0bef9cedbbdae3d548 Author: Zac Medico gentoo org> AuthorDate: Sun May 8 20:19:47 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun May 8 20:48:51 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3De32d4fc7 Remove obsolete others_in_slot plibs code. This code dates back to commit 79a2ade5a6cb5a6c2d7ace838a39a634265c5522 and the preserve-libs logic was different back then. At that time, the dblink._preserve_libs() method would earlier register preserved libs for the new package currently being merged, while the vardb entry was still a -MERGING- node. Current code does not register preserve_paths until later, so this others_in_slot code is obsolete. --- pym/portage/dbapi/vartree.py | 14 ++------------ 1 files changed, 2 insertions(+), 12 deletions(-) diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 156defc..7072ce0 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -1462,7 +1462,7 @@ class dblink(object): self.contentscache =3D pkgfiles return pkgfiles =20 - def _prune_plib_registry(self, unmerge=3DFalse, others_in_slot=3D[], + def _prune_plib_registry(self, unmerge=3DFalse, needed=3DNone, preserve_paths=3DNone): # remove preserved libraries that don't have any consumers left plib_registry =3D self.vartree.dbapi._plib_registry @@ -1485,15 +1485,6 @@ class dblink(object): if cpv_lib_map: self._remove_preserved_libs(cpv_lib_map) for cpv, removed in cpv_lib_map.items(): - if not self.vartree.dbapi.cpv_exists(cpv): - for dblnk in others_in_slot: - if dblnk.mycpv =3D=3D cpv: - # This one just got merged so it doesn't - # register with cpv_exists() yet. - self.vartree.dbapi.removeFromContents( - dblnk, removed) - break - continue self.vartree.dbapi.removeFromContents(cpv, removed) =20 if unmerge: @@ -1645,8 +1636,7 @@ class dblink(object): showMessage(_("!!! FAILED postrm: %s\n") % retval, level=3Dlogging.ERROR, noiselevel=3D-1) =20 - self._prune_plib_registry(unmerge=3DTrue, - others_in_slot=3Dothers_in_slot, needed=3Dneeded, + self._prune_plib_registry(unmerge=3DTrue, needed=3Dneeded, preserve_paths=3Dpreserve_paths) finally: self.vartree.dbapi._bump_mtime(self.mycpv)