diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-10-10 08:35:40 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-10-10 08:35:40 +0000 |
| commit | d84f6c79157771b629985653796a95eada3b93d0 (patch) | |
| tree | cbd201ba461f2f97d6af08dc8fa3f743833fcc9d /pym/portage_update.py | |
| parent | 4ff228b1b041923c4c78dd9a8428befd655b7402 (diff) | |
| download | portage-d84f6c79157771b629985653796a95eada3b93d0.tar.gz portage-d84f6c79157771b629985653796a95eada3b93d0.tar.bz2 portage-d84f6c79157771b629985653796a95eada3b93d0.zip | |
Only do a slotmove on a slot dep atom if the slotmove atom has no operator (otherwise there's not enough information to perform the slotmove).
svn path=/main/trunk/; revision=4647
Diffstat (limited to 'pym/portage_update.py')
| -rw-r--r-- | pym/portage_update.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pym/portage_update.py b/pym/portage_update.py index bed74c35c..57aa8b43b 100644 --- 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): |