summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-08-15 17:39:08 +0000
committerZac Medico <zmedico@gentoo.org>2008-08-15 17:39:08 +0000
commit0c7da1aa5b5dda91bfe185c8921abd4f067b09d2 (patch)
treeca604928e27d4e0ec1cba9e352070b9c5e5f79d6
parent7d757300f1da30c9e8f0fdf33827f69d8f1d334e (diff)
downloadportage-0c7da1aa5b5dda91bfe185c8921abd4f067b09d2.tar.gz
portage-0c7da1aa5b5dda91bfe185c8921abd4f067b09d2.tar.bz2
portage-0c7da1aa5b5dda91bfe185c8921abd4f067b09d2.zip
Pass atom instances into action_depclean() instead of the plain strings.
svn path=/main/trunk/; revision=11415
-rw-r--r--pym/_emerge/__init__.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index a7ab256a3..6ea8c2bd4 100644
--- 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: