Only do a slotmove on a slot dep atom if the slotmove atom has no operator (otherwise...

svn path=/main/trunk/; revision=4647

diff --git a/pym/portage_update.py b/pym/portage_update.py
index bed74c35ccd379e5641d9a379a0e821bbe10a531..57aa8b43bc943b121b734a246ccd346dae04c9ac 100644 (file)
--- a/pym/portage_update.py
+++ b/pym/portage_update.py
@@ -8,7 +8,7 @@ from portage_util import ConfigProtect, grabfile, new_protect_filename, \
        normalize_path, write_atomic, writemsg
 from portage_exception import DirectoryNotFound, PortageException
 from portage_versions import ververify
-from portage_dep import dep_getkey, isvalidatom, isjustname
+from portage_dep import dep_getkey, get_operator, isvalidatom, isjustname
 from portage_const import USER_CONFIG_PATH, WORLD_FILE
 
 ignored_dbentries = ("CONTENTS", "environment.bz2")
@@ -25,7 +25,7 @@ def update_dbentry(update_cmd, mycontent):
                                else:
                                        return "".join(matchobj.groups())
                        mycontent = re.sub("(%s-)(\\S*)" % old_value, myreplace, mycontent)
-       elif update_cmd[0] == "slotmove":
+       elif update_cmd[0] == "slotmove" and get_operator(update_cmd[1]) is None:
                pkg, origslot, newslot = update_cmd[1:]
                old_value = "%s:%s" % (pkg, origslot)
                if mycontent.count(old_value):