diff options
author | Zac Medico <zmedico@gentoo.org> | 2009-10-18 03:54:13 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2009-10-18 03:54:13 +0000 |
commit | b330c160cdbf58f644f5d9cc108c2d3fbe2ba44d (patch) | |
tree | a2e85fed77243573e04b4e2a6aa9578a74aa8fcb /pym/_emerge/unmerge.py | |
parent | 79d780d53e3b4ca34ac7b98c08ad686c6ef4ada9 (diff) | |
download | portage-b330c160cdbf58f644f5d9cc108c2d3fbe2ba44d.tar.gz portage-b330c160cdbf58f644f5d9cc108c2d3fbe2ba44d.tar.bz2 portage-b330c160cdbf58f644f5d9cc108c2d3fbe2ba44d.zip |
Merge the internal package set changes from trunk r14614 (bug #266454). None
of these changes should be noticeable to users. This is just to keep the diff
relative to trunk as small as possible.
svn path=/main/branches/2.1.7/; revision=14642
Diffstat (limited to 'pym/_emerge/unmerge.py')
-rw-r--r-- | pym/_emerge/unmerge.py | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/pym/_emerge/unmerge.py b/pym/_emerge/unmerge.py index caf6e8e68..ef8b92cc5 100644 --- a/pym/_emerge/unmerge.py +++ b/pym/_emerge/unmerge.py @@ -424,22 +424,22 @@ def unmerge(root_config, myopts, unmerge_action, raise UninstallFailure(retval) sys.exit(retval) else: - if clean_world and hasattr(sets["world"], "cleanPackage")\ - and hasattr(sets["world"], "lock"): - sets["world"].lock() - if hasattr(sets["world"], "load"): - sets["world"].load() - sets["world"].cleanPackage(vartree.dbapi, y) - sets["world"].unlock() + if clean_world and hasattr(sets["selected"], "cleanPackage")\ + and hasattr(sets["selected"], "lock"): + sets["selected"].lock() + if hasattr(sets["selected"], "load"): + sets["selected"].load() + sets["selected"].cleanPackage(vartree.dbapi, y) + sets["selected"].unlock() emergelog(xterm_titles, " >>> unmerge success: "+y) - if clean_world and hasattr(sets["world"], "remove")\ - and hasattr(sets["world"], "lock"): - sets["world"].lock() + if clean_world and hasattr(sets["selected"], "remove")\ + and hasattr(sets["selected"], "lock"): + sets["selected"].lock() # load is called inside remove() for s in root_config.setconfig.active: - sets["world"].remove(SETPREFIX+s) - sets["world"].unlock() + sets["selected"].remove(SETPREFIX + s) + sets["selected"].unlock() return 1 |