diff options
| -rwxr-xr-x | bin/repoman | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/bin/repoman b/bin/repoman index 5ed5c0b62..7f381da94 100755 --- a/bin/repoman +++ b/bin/repoman @@ -1251,14 +1251,15 @@ for x in scanlist: if token in operator_tokens or \ token.endswith("?"): continue - if not portage.isvalidatom(token, allow_blockers=True): + try: + atom = portage.dep.Atom(token) + except portage.exception.InvalidAtom: badsyntax.append("'%s' not a valid atom" % token) else: - atom = token - is_blocker = atom.startswith("!") - if is_blocker: - atom = token.lstrip("!") - atom = portage.dep.Atom(atom) + is_blocker = atom.blocker + if atom.blocker: + atom = portage.dep.Atom(atom[1:]) + if mytype == "DEPEND" and \ not is_blocker and \ not inherited_java_eclass and \ |