Pass atom instances into action_depclean() instead of the plain strings.

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

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index a7ab256a336ce179373ecc46938e08c4975b889f..6ea8c2bd467706d88070df38f2d3247ce624447c 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -13704,10 +13704,12 @@ def emerge_main():
 
                # Ensure atoms are valid before calling unmerge().
                vardb = trees[settings["ROOT"]]["vartree"].dbapi
+               valid_atoms = []
                for x in myfiles:
                        if is_valid_package_atom(x):
                                try:
-                                       portage.dep_expand(x, mydb=vardb, settings=settings)
+                                       valid_atoms.append(
+                                               portage.dep_expand(x, mydb=vardb, settings=settings))
                                except ValueError, e:
                                        msg = "The short ebuild name \"" + x + \
                                                "\" is ambiguous.  Please specify " + \
@@ -13731,7 +13733,7 @@ def emerge_main():
 
                validate_ebuild_environment(trees)
                action_depclean(settings, trees, mtimedb["ldpath"],
-                       myopts, myaction, myfiles, spinner)
+                       myopts, myaction, valid_atoms, spinner)
                if not (buildpkgonly or fetchonly or pretend):
                        post_emerge(root_config, myopts, mtimedb, os.EX_OK)
        # "update", "system", or just process files: