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

to be uninstalled. (trunk r12018)

svn path=/main/branches/2.1.6/; revision=12019

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index f261ebaf778d66950437e66802daa5eae16c3fca..8762d68d9767458255eba578f3ba2178ff23880c 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -12435,7 +12435,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: