diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-05-31 09:17:07 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-05-31 09:17:07 +0000 |
| commit | 85c6b18a55fef178328dd7f8fbd1f271bf5e24c3 (patch) | |
| tree | 817e7c0a96c89e33762da6eed3f5f55cbc9d465a /bin | |
| parent | fecc6af2264ea2d62121bc545fe7817c26956058 (diff) | |
| download | portage-85c6b18a55fef178328dd7f8fbd1f271bf5e24c3.tar.gz portage-85c6b18a55fef178328dd7f8fbd1f271bf5e24c3.tar.bz2 portage-85c6b18a55fef178328dd7f8fbd1f271bf5e24c3.zip | |
* Tweak isvalidatom() to treat "null" category as valid, but missing category
as invalid (previously both where treated as invalid).
* Fix a spot inside emerge's unmerge() function that sometimes generates
invalid atoms by adding an unnecessary "=" to the front. Even when in
cases that resulted in a valid atom here, adding the "=" was redundant
because dep_expand() does that automatically now (for backward compat).
(trunk r10516)
svn path=/main/branches/2.1.2/; revision=10517
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/emerge | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/bin/emerge b/bin/emerge index a1761e7e7..886d2a2ef 100755 --- a/bin/emerge +++ b/bin/emerge @@ -6510,8 +6510,7 @@ def unmerge(settings, myopts, vartree, unmerge_action, sys.exit(1) if not mymatch and x[0] not in "<>=~": - #add a "=" if missing - mymatch=localtree.dep_match("="+x) + mymatch = localtree.dep_match(x) if not mymatch: portage.writemsg("\n--- Couldn't find '%s' to %s.\n" % \ (x, unmerge_action), noiselevel=-1) |