diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-10-24 01:33:51 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-10-24 01:33:51 +0000 |
| commit | c73615eaf3e9bf603493f316494f8b131f0c1391 (patch) | |
| tree | 5974f2900c066c5d29de9db8464e0d4e7882122a | |
| parent | c92334443cb47ddc9d03e403b1cc2bd02f350acc (diff) | |
| download | portage-c73615eaf3e9bf603493f316494f8b131f0c1391.tar.gz portage-c73615eaf3e9bf603493f316494f8b131f0c1391.tar.bz2 portage-c73615eaf3e9bf603493f316494f8b131f0c1391.zip | |
Make world atoms non-greedy for SLOTs in action_depclean()
since users can simply add SLOT atoms to world for any
specific SLOTs that they want to keep.
svn path=/main/trunk/; revision=8264
| -rw-r--r-- | pym/_emerge/__init__.py | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 852f53c03..38e87c43a 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -5654,25 +5654,7 @@ def action_depclean(settings, trees, ldpath_mtimes, if not arg_atom: filtered_pkgs.append(pkg) pkgs = filtered_pkgs - prune_this = False - if action == "prune": - for pkg in pkgs: - metadata = dict(izip(metadata_keys, - vardb.aux_get(pkg, metadata_keys))) - try: - arg_atom = args_set.findAtomForPackage(pkg, metadata) - except portage.exception.InvalidDependString, e: - file_path = os.path.join(myroot, VDB_PATH, pkg, "PROVIDE") - portage.writemsg("\n\nInvalid PROVIDE: %s\n" % str(s), - noiselevel=-1) - portage.writemsg("See '%s'\n" % file_path, - noiselevel=-1) - del e - continue - if arg_atom: - prune_this = True - break - if len(pkgs) > 1 and (parent != "world" or prune_this): + if len(pkgs) > 1: # Prune all but the best matching slot, since that's all that a # deep world update would pull in. Don't prune if this atom comes # directly from world though, since world atoms are greedy when |