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 <gentoo-commits+bounces-343251-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1QJASS-0005qx-AY
for garchives@archives.gentoo.org; Sun, 08 May 2011 20:20:04 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 11F8D1C04C;
Sun, 8 May 2011 20:19:56 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id D2E141C04C
for <gentoo-commits@lists.gentoo.org>; Sun, 8 May 2011 20:19:56 +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 32A1E1B4064
for <gentoo-commits@lists.gentoo.org>; Sun, 8 May 2011 20:19:56 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id 54AE145B2A
for <gentoo-commits@lists.gentoo.org>; Sun, 8 May 2011 20:19:55 +0000 (UTC)
From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org>
Message-ID: <3a68bf5dff34a8e5e991778c1e28a3a6dda4d141.zmedico@gentoo>
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: 3a68bf5dff34a8e5e991778c1e28a3a6dda4d141
Date: Sun, 8 May 2011 20:19:55 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt:
X-Archives-Hash: 3e66e5815240a3a66445ffdf169579cc
commit: 3a68bf5dff34a8e5e991778c1e28a3a6dda4d141
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun May 8 20:19:47 2011 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun May 8 20:19:47 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a=
=3Dcommit;h=3D3a68bf5d
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 28b67f0..b4e231e 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:
@@ -1664,8 +1655,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)