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 1ADA21391DB for ; Mon, 4 Aug 2014 09:02:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BA851E085B; Mon, 4 Aug 2014 09:02:17 +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 3D3CBE0857 for ; Mon, 4 Aug 2014 09:02:17 +0000 (UTC) Received: from pomiot.lan (77-253-194-255.adsl.inetia.pl [77.253.194.255]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: mgorny) by smtp.gentoo.org (Postfix) with ESMTPSA id 84B4434004F; Mon, 4 Aug 2014 09:02:15 +0000 (UTC) From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= To: gentoo-portage-dev@lists.gentoo.org Cc: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Subject: [gentoo-portage-dev] [PATCH] repoman: fix atom.blocker checks. Date: Mon, 4 Aug 2014 11:02:27 +0200 Message-Id: <1407142947-7067-1-git-send-email-mgorny@gentoo.org> X-Mailer: git-send-email 2.0.4 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-portage-dev@lists.gentoo.org Reply-to: gentoo-portage-dev@lists.gentoo.org X-Archives-Salt: 790e51b2-a9e5-4d6c-aa2b-03a7a4f2772f X-Archives-Hash: 27fb765a18eab47a078ddb2ae55b394d 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: -- 2.0.4