summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-11-21 21:55:43 +0000
committerZac Medico <zmedico@gentoo.org>2008-11-21 21:55:43 +0000
commit545e33b9c3c47a312a38013fc02187929fd7e3e0 (patch)
treef9cd49069c168334632229e0f76e4245bed823b1
parentd82225a6c9e6702bcdb4022649f6666981565359 (diff)
downloadportage-545e33b9c3c47a312a38013fc02187929fd7e3e0.tar.gz
portage-545e33b9c3c47a312a38013fc02187929fd7e3e0.tar.bz2
portage-545e33b9c3c47a312a38013fc02187929fd7e3e0.zip
Bug #248059 - In action_depclean(), ignore invalid atoms in deps of packages
to be uninstalled. svn path=/main/trunk/; revision=12018
-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 8978c4684..349263361 100644
--- 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: