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 1QMZID-0004qi-BE for garchives@archives.gentoo.org; Wed, 18 May 2011 05:27:33 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D62A41C10B; Wed, 18 May 2011 05:27:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A104B1C10B for ; Wed, 18 May 2011 05:27:25 +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 38BB61B4010 for ; Wed, 18 May 2011 05:27:25 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 9EA6545973 for ; Wed, 18 May 2011 05:27:24 +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: <4bc4e589bd925d0bad8c6e5b8e30e3c37a371c01.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: 4bc4e589bd925d0bad8c6e5b8e30e3c37a371c01 Date: Wed, 18 May 2011 05:27:24 +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: 35a96278250ec5a0f4c96d0ebcee81e7 commit: 4bc4e589bd925d0bad8c6e5b8e30e3c37a371c01 Author: Zac Medico gentoo org> AuthorDate: Wed May 18 05:27:07 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed May 18 05:27:07 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D4bc4e589 preserve-libs: check for broken linkmap more --- pym/portage/dbapi/vartree.py | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index cae8cd0..fd5c774 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -1498,9 +1498,11 @@ class dblink(object): 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 - if plib_registry: + if not (self._linkmap_broken or + self.vartree.dbapi._linkmap is None or + self.vartree.dbapi._plib_registry is None): self.vartree.dbapi._fs_lock() + plib_registry =3D self.vartree.dbapi._plib_registry plib_registry.lock() try: plib_registry.load() @@ -3405,7 +3407,8 @@ class dblink(object): =20 preserve_paths =3D set() needed =3D None - if not (linkmap is None or plib_registry is None): + if not (self._linkmap_broken or linkmap is None or + plib_registry is None): self.vartree.dbapi._fs_lock() plib_registry.lock() try: