From d85e2123491fd84414b8d071de986d249ac194d9 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 19 Sep 2009 20:10:56 +0000 Subject: Remove obsolete InvalidAtom handler in _add_pkg_dep_string(). svn path=/main/trunk/; revision=14283 --- pym/_emerge/depgraph.py | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) (limited to 'pym/_emerge') diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 5b03dc3a2..e4affdf37 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -1148,23 +1148,16 @@ class depgraph(object): vardb = self._frozen_config.roots[dep_root].trees["vartree"].dbapi for atom in selected_atoms[pkg]: - try: - mypriority = dep_priority.copy() - if not atom.blocker and vardb.match(atom): - mypriority.satisfied = True - if not self._add_dep(Dependency(atom=atom, - blocker=atom.blocker, depth=depth, parent=pkg, - priority=mypriority, root=dep_root), - allow_unsatisfied=allow_unsatisfied): - return 0 + mypriority = dep_priority.copy() + if not atom.blocker and vardb.match(atom): + mypriority.satisfied = True - except portage.exception.InvalidAtom, e: - show_invalid_depstring_notice( - pkg, dep_string, str(e)) - del e - if not pkg.installed: - return 0 + if not self._add_dep(Dependency(atom=atom, + blocker=atom.blocker, depth=depth, parent=pkg, + priority=mypriority, root=dep_root), + allow_unsatisfied=allow_unsatisfied): + return 0 selected_atoms.pop(pkg) -- cgit v1.2.3-1-g7c22