summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-05-30 00:03:45 +0000
committerZac Medico <zmedico@gentoo.org>2008-05-30 00:03:45 +0000
commit60e059b93342bf178f1059db21dbef5f7edda844 (patch)
treead3c98395ab2cdc1fe178894b8399e1da0341de3 /bin
parentWhen dropping deps from the resume list, make sure that the loop can't (diff)
downloadportage-multirepo-60e059b93342bf178f1059db21dbef5f7edda844.tar.gz
portage-multirepo-60e059b93342bf178f1059db21dbef5f7edda844.tar.bz2
portage-multirepo-60e059b93342bf178f1059db21dbef5f7edda844.zip
Create Atom instances earlier to avoid redundant validation.
svn path=/main/trunk/; revision=10495
Diffstat (limited to 'bin')
-rwxr-xr-xbin/repoman13
1 files changed, 7 insertions, 6 deletions
diff --git a/bin/repoman b/bin/repoman
index 5ed5c0b6..7f381da9 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 \