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 4755113877A for ; Wed, 6 Aug 2014 21:11:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 15FAAE0921; Wed, 6 Aug 2014 21:11:15 +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 B8562E0921 for ; Wed, 6 Aug 2014 21:11:14 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BD6B93400FF for ; Wed, 6 Aug 2014 21:11:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 5C0AA18810 for ; Wed, 6 Aug 2014 21:11:12 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1407359498.72a1f979342d89f41594f40fc6074fcd3ede9086.mgorny@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/repoman X-VCS-Directories: bin/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 72a1f979342d89f41594f40fc6074fcd3ede9086 X-VCS-Branch: master Date: Wed, 6 Aug 2014 21:11:12 +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: 7fd0dff0-c492-46da-b03e-8b787753375c X-Archives-Hash: 92f05e757d59b2da0c875fbbc35ccad4 Message-ID: <20140806211112.2Q3GakSUC2ev5M-fOLQiZ0Y1xnMROtaRroaOW3zXTvM@z> commit: 72a1f979342d89f41594f40fc6074fcd3ede9086 Author: Michał Górny gentoo org> AuthorDate: Mon Aug 4 08:57:07 2014 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Aug 6 21:11:38 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=72a1f979 repoman: fix atom.blocker checks. The original checks assume that no-blocker is denoted as 'None'. However, currently atom.blocker returns just 'False'. --- bin/repoman | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/repoman b/bin/repoman index 9c5d720..71fc7f0 100755 --- a/bin/repoman +++ b/bin/repoman @@ -2042,16 +2042,16 @@ for x in effective_scanlist: if atom == "||": continue + is_blocker = atom.blocker + # Skip dependency.unknown for blockers, so that we # don't encourage people to remove necessary blockers, # as discussed in bug #382407. - if atom.blocker is None and \ + if not is_blocker and \ not portdb.xmatch("match-all", atom) and \ not atom.cp.startswith("virtual/"): unknown_pkgs.add((mytype, atom.unevaluated_atom)) - is_blocker = atom.blocker - if catdir != "virtual": if not is_blocker and \ atom.cp in suspect_virtual: