From 60f8dd151644aea0547d58bd59733b0466d01298 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 31 May 2008 09:11:25 +0000 Subject: * 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 --- pym/_emerge/__init__.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'pym/_emerge') 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) -- cgit v1.2.3-1-g7c22