From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 21 Nov 2008 21:57:02 +0000 (-0000)
Subject: Bug #248059 - In action_depclean(), ignore invalid atoms in deps of packages
X-Git-Tag: v2.1.6_rc1~27
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e27b61a3552f6d9266c3d4df9928e468dcfdfe71;p=portage.git

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 f261ebaf7..8762d68d9 100644
--- 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: