depclean summary: count nested sets, bug #298298

diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index 3f7a6d5317cb8e5dbd0009f2598d11865f398b1a..f3bf8589776333f9d608e9b020dce5feca0e9170 100644 (file)
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -619,11 +619,17 @@ def action_depclean(settings, trees, ldpath_mtimes,
        if not cleanlist and "--quiet" in myopts:
                return rval
 
+       set_atoms = {}
+       for k in ("system", "selected"):
+               try:
+                       set_atoms[k] = root_config.setconfig.getSetAtoms(k)
+               except portage.exception.PackageSetNotFound:
+                       # A nested set could not be resolved, so ignore nested sets.
+                       set_atoms[k] = root_config.sets[k].getAtoms()
+
        print("Packages installed:   " + str(len(vardb.cpv_all())))
-       print("Packages in world:    " + \
-               str(len(root_config.sets["selected"].getAtoms())))
-       print("Packages in system:   " + \
-               str(len(root_config.sets["system"].getAtoms())))
+       print("Packages in world:    %d" % len(set_atoms["selected"]))
+       print("Packages in system:   %d" % len(set_atoms["system"]))
        print("Required packages:    "+str(req_pkg_count))
        if "--pretend" in myopts:
                print("Number to remove:     "+str(len(cleanlist)))