diff options
author | Jason Stubbs <jstubbs@gentoo.org> | 2005-10-01 15:29:44 +0000 |
---|---|---|
committer | Jason Stubbs <jstubbs@gentoo.org> | 2005-10-01 15:29:44 +0000 |
commit | 15ba58355f705f2db47a8b42eabeb5927e7f643b (patch) | |
tree | 9aec4c64495fa95d4157cf45204856ac6a23e704 | |
parent | 638c456eac1010cbb8162914ce591df0313d0d2c (diff) | |
download | portage-15ba58355f705f2db47a8b42eabeb5927e7f643b.tar.gz portage-15ba58355f705f2db47a8b42eabeb5927e7f643b.tar.bz2 portage-15ba58355f705f2db47a8b42eabeb5927e7f643b.zip |
Restore full range of possible atoms that can be given to emerge by doing
atom validity checks using a dummy category if necessary.
svn path=/main/branches/2.0/; revision=2068
-rwxr-xr-x | bin/emerge | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/bin/emerge b/bin/emerge index 5341fbcbf..daa6c8351 100755 --- a/bin/emerge +++ b/bin/emerge @@ -1083,7 +1083,14 @@ class depgraph: elif not "--oneshot" in myopts: myfavorites.append(mykey) else: - if not portage.isvalidatom(x) and not portage.isvalidatom("cat/"+x): + testkey = portage.dep_getkey(x) + if testkey.startswith("null/"): + testatom = x.replace(testkey[5:], "cat/"+testkey[5:]) + elif "/" not in x: + testatom = "cat/"+x + else: + testatom = x + if not portage.isvalidatom(testatom): print ("\n\n!!! '%s' is not a valid package atom." % x) print "!!! Please check ebuild(5) for full details." print "!!! (Did you specify a version but forget to prefix with '='?)" |