From 6d57699e5f9a4656f5c5e841f0abd14261a7375e Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 16 Feb 2008 07:53:40 +0000 Subject: Make depclean code filter out blocker atoms where appropriate. svn path=/main/trunk/; revision=9340 --- pym/_emerge/__init__.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 9177a090d..19dfc23e6 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -6414,7 +6414,7 @@ def action_depclean(settings, trees, ldpath_mtimes, atom, parent, priority = remaining_atoms.pop() pkgs = vardb.match(atom) if not pkgs: - if not atom.startswith("!") and priority > UnmergeDepPriority.SOFT: + if priority > UnmergeDepPriority.SOFT: unresolveable.setdefault(atom, []).append(parent) continue if action == "depclean" and parent == "world" and myfiles: @@ -6491,6 +6491,8 @@ def action_depclean(settings, trees, ldpath_mtimes, print "Candidates:", atoms for atom in atoms: + if atom.startswith("!"): + continue remaining_atoms.append((atom, pkg, priority)) if "--quiet" not in myopts: @@ -6607,6 +6609,8 @@ def action_depclean(settings, trees, ldpath_mtimes, priority = priority_map[dep_type] for atom in atoms: + if atom.startswith("!"): + continue matches = vardb.match(atom) if not matches: continue -- cgit v1.2.3-1-g7c22