diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-05-31 09:11:25 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-05-31 09:11:25 +0000 |
| commit | 60f8dd151644aea0547d58bd59733b0466d01298 (patch) | |
| tree | b93197cb808c245971b709c46ce8c7ed327c7df7 /pym/_emerge | |
| parent | 3fffbe3667570d1ee9dc55e799d214e10c79d5b8 (diff) | |
| download | portage-60f8dd151644aea0547d58bd59733b0466d01298.tar.gz portage-60f8dd151644aea0547d58bd59733b0466d01298.tar.bz2 portage-60f8dd151644aea0547d58bd59733b0466d01298.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).
svn path=/main/trunk/; revision=10516
Diffstat (limited to 'pym/_emerge')
| -rw-r--r-- | pym/_emerge/__init__.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 7d9cbdfa8..8a73156e9 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -6427,8 +6427,7 @@ def unmerge(root_config, myopts, 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) |