Gentoo Archives: gentoo-portage-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-portage-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-portage-dev] [PATCH] repoman: fix atom.blocker checks.
Date: Mon, 04 Aug 2014 09:02:21
Message-Id: 1407142947-7067-1-git-send-email-mgorny@gentoo.org
1 The original checks assume that no-blocker is denoted as 'None'.
2 However, currently atom.blocker returns just 'False'.
3 ---
4 bin/repoman | 6 +++---
5 1 file changed, 3 insertions(+), 3 deletions(-)
6
7 diff --git a/bin/repoman b/bin/repoman
8 index 9c5d720..71fc7f0 100755
9 --- a/bin/repoman
10 +++ b/bin/repoman
11 @@ -2042,16 +2042,16 @@ for x in effective_scanlist:
12 if atom == "||":
13 continue
14
15 + is_blocker = atom.blocker
16 +
17 # Skip dependency.unknown for blockers, so that we
18 # don't encourage people to remove necessary blockers,
19 # as discussed in bug #382407.
20 - if atom.blocker is None and \
21 + if not is_blocker and \
22 not portdb.xmatch("match-all", atom) and \
23 not atom.cp.startswith("virtual/"):
24 unknown_pkgs.add((mytype, atom.unevaluated_atom))
25
26 - is_blocker = atom.blocker
27 -
28 if catdir != "virtual":
29 if not is_blocker and \
30 atom.cp in suspect_virtual:
31 --
32 2.0.4

Replies