commit: 72a1f979342d89f41594f40fc6074fcd3ede9086
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 4 08:57:07 2014 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> 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:
