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 1QNm1b-0006ng-3f for garchives@archives.gentoo.org; Sat, 21 May 2011 13:15:23 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DCC721C070; Sat, 21 May 2011 13:15:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A88BA1C070 for ; Sat, 21 May 2011 13:15: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 1107A1B4018 for ; Sat, 21 May 2011 13:15:14 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 3A2788001F for ; Sat, 21 May 2011 13:15: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: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: bc372d37ec55bf3ff0b38942f9c6080f3ca61a75 Date: Sat, 21 May 2011 13:15: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: 1477b70c955a584fc88b48160c21a0de commit: bc372d37ec55bf3ff0b38942f9c6080f3ca61a75 Author: Zac Medico gentoo org> AuthorDate: Sat May 21 13:09:46 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat May 21 13:09:46 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dbc372d37 _prune_plib_registry: correct _match_contents use --- pym/portage/dbapi/vartree.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index cd93a12..60d52a8 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -1532,7 +1532,7 @@ class dblink(object): if unmerge_preserve: for path in sorted(unmerge_preserve): contents_key =3D self._match_contents(path) - if contents_key is None: + if not contents_key: continue obj_type =3D self.getcontents()[contents_key][0] self._display_merge(_(">>> needed %s %s\n") % \