summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-11-21 21:57:02 +0000
committerZac Medico <zmedico@gentoo.org>2008-11-21 21:57:02 +0000
commite27b61a3552f6d9266c3d4df9928e468dcfdfe71 (patch)
tree71f6c39fc93cf51c861b81525c47373d6669bb52
parent826a95ce77c9ea2dccf74d7317c212be42d29cea (diff)
downloadportage-e27b61a3552f6d9266c3d4df9928e468dcfdfe71.tar.gz
portage-e27b61a3552f6d9266c3d4df9928e468dcfdfe71.tar.bz2
portage-e27b61a3552f6d9266c3d4df9928e468dcfdfe71.zip
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
-rw-r--r--pym/_emerge/__init__.py5
1 files changed, 4 insertions, 1 deletions
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: