Bug #248059 - In action_depclean(), ignore invalid atoms in deps of packages

to be uninstalled.

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

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 8978c46840a18b5f46d18a8f34a5de677dc4e5e9..3492633611380b0d90e5d4d5a5f9fbc5f4ed7a5a 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -12783,7 +12783,10 @@ def action_depclean(settings, trees, ldpath_mtimes,
  
                                priority = priority_map[dep_type]
                                for atom in atoms:
-                                       if atom.startswith("!"):
+                                       if not isinstance(atom, portage.dep.Atom):
+                                               # Ignore invalid atoms returned from dep_check().
+                                               continue
+                                       if atom.blocker:
                                                continue
                                        matches = vardb.match_pkgs(atom)
                                        if not matches: