From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id D53D4138D19 for ; Tue, 14 Jul 2015 18:07:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 749D6E083C; Tue, 14 Jul 2015 18:07:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1C27BE083C for ; Tue, 14 Jul 2015 18:07:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 108E2340A3B for ; Tue, 14 Jul 2015 18:07:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6E08C74B for ; Tue, 14 Jul 2015 18:06:58 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1436897200.2afd8f2c533e6e000b5619282a4cd4c71405eb62.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/BlockerDB.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 2afd8f2c533e6e000b5619282a4cd4c71405eb62 X-VCS-Branch: master Date: Tue, 14 Jul 2015 18:06:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2f68ce54-805c-4cfe-bd24-0e26f6290a7d X-Archives-Hash: 72a2ec277835bf4949983d931343e5c8 commit: 2afd8f2c533e6e000b5619282a4cd4c71405eb62 Author: Zac Medico gentoo org> AuthorDate: Sun Jul 12 04:57:19 2015 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Jul 14 18:06:40 2015 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=2afd8f2c BlockerDB.discardBlocker: convert str to Atom for DbapiProvidesIndex (bug 554578) Since commit 11467fc640995e3dc8897c82bbc7130d5bf27d05, only Atom instances are allowed to be passed into match_pkgs calls. Fixes: 11467fc64099 ("depgraph: soname dependency resolution (bug 282639)") X-Gentoo-Bug: 554578 X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=554578 Acked-by: Brian Dolbec gentoo.org> pym/_emerge/BlockerDB.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pym/_emerge/BlockerDB.py b/pym/_emerge/BlockerDB.py index 8bb8f5f..44a70a0 100644 --- a/pym/_emerge/BlockerDB.py +++ b/pym/_emerge/BlockerDB.py @@ -1,4 +1,4 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 import sys @@ -7,6 +7,7 @@ import portage from portage import os from portage import digraph from portage._sets.base import InternalPackageSet +from portage.dep import Atom from _emerge.BlockerCache import BlockerCache from _emerge.Package import Package @@ -117,7 +118,7 @@ class BlockerDB(object): def discardBlocker(self, pkg): """Discard a package from the list of potential blockers. This will match any package(s) with identical cpv or cp:slot.""" - for cpv_match in self._fake_vartree.dbapi.match_pkgs("=%s" % (pkg.cpv,)): + for cpv_match in self._fake_vartree.dbapi.match_pkgs(Atom("=%s" % (pkg.cpv,))): if cpv_match.cp == pkg.cp: self._fake_vartree.cpv_discard(cpv_match) for slot_match in self._fake_vartree.dbapi.match_pkgs(pkg.slot_atom):