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 1QJAsS-0008Ug-G9 for garchives@archives.gentoo.org; Sun, 08 May 2011 20:46:56 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3EE9F1C006; Sun, 8 May 2011 20:46:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 061021C006 for ; Sun, 8 May 2011 20:46:48 +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 9F5AE1B4062 for ; Sun, 8 May 2011 20:46:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id EC3BC45B2A for ; Sun, 8 May 2011 20:46:46 +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: adbefe1e3c84f4015e7dbcc9aee18b0f10833e4d Date: Sun, 8 May 2011 20:46:46 +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: 2262bdf37c2bb18290e5b5c2646ae721 commit: adbefe1e3c84f4015e7dbcc9aee18b0f10833e4d Author: Zac Medico gentoo org> AuthorDate: Sun May 8 20:46:40 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun May 8 20:46:40 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dadbefe1e Add back cpv_exists check from previous commit. --- pym/portage/dbapi/vartree.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index b4e231e..a34f1ec 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -1485,6 +1485,8 @@ 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): + continue self.vartree.dbapi.removeFromContents(cpv, removed) =20 if unmerge: