From 71d5033616628fac505714346d74a4460fe60a6d Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 29 Jun 2008 06:46:13 +0000 Subject: Handle invalid atoms inside depgraph._add_pkg_deps(), to avoid an unhandled InvalidAtom exception from dep_expand() when matching against the vardb. svn path=/main/trunk/; revision=10844 --- pym/_emerge/__init__.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 4929288f3..6bafb5276 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -2749,6 +2749,13 @@ class depgraph(object): if debug: print "Candidates:", selected_atoms for atom in selected_atoms: + if isinstance(atom, basestring) \ + and not portage.isvalidatom(atom): + show_invalid_depstring_notice( + pkg, dep_string, str(atom)) + if not pkg.installed: + return 0 + continue blocker = atom.startswith("!") if blocker: atom = atom[1:] -- cgit v1.2.3-1-g7c22