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/actions.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/actions.py')
| -rw-r--r-- | pym/_emerge/actions.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index bae996be7..faaf3f845 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -617,7 +617,7 @@ def action_depclean(settings, trees, ldpath_mtimes, print("Packages installed: " + str(len(vardb.cpv_all()))) print("Packages in world: " + \ - str(len(root_config.sets["world"].getAtoms()))) + str(len(root_config.sets["selected"].getAtoms()))) print("Packages in system: " + \ str(len(root_config.sets["system"].getAtoms()))) print("Required packages: "+str(req_pkg_count)) @@ -637,7 +637,7 @@ def calc_depclean(settings, trees, ldpath_mtimes, vardb = trees[myroot]["vartree"].dbapi deselect = myopts.get('--deselect') != 'n' - required_set_names = ("system", "world") + required_set_names = ("world",) required_sets = {} set_args = [] @@ -650,7 +650,7 @@ def calc_depclean(settings, trees, ldpath_mtimes, # which excludes packages that are intended to be eligible for # removal. world_temp_set = required_sets["world"] - system_set = required_sets["system"] + system_set = root_config.sets["system"] if not system_set or not world_temp_set: @@ -997,9 +997,9 @@ def calc_depclean(settings, trees, ldpath_mtimes, def action_deselect(settings, trees, opts, atoms): root_config = trees[settings['ROOT']]['root_config'] - world_set = root_config.sets['world'] + world_set = root_config.sets['selected'] if not hasattr(world_set, 'update'): - writemsg_level("World set does not appear to be mutable.\n", + writemsg_level("World @selected set does not appear to be mutable.\n", level=logging.ERROR, noiselevel=-1) return 1 |