From c32bbd2e8b207b4a35af70983b170081feabc8df Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 30 May 2008 00:13:34 +0000 Subject: Create Atom instances earlier to avoid redundant validation. (trunk r10495) svn path=/main/branches/2.1.2/; revision=10496 --- bin/repoman | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'bin/repoman') diff --git a/bin/repoman b/bin/repoman index 9f48a1536..4749523dd 100755 --- a/bin/repoman +++ b/bin/repoman @@ -1702,14 +1702,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 \ -- cgit v1.2.3-1-g7c22