Remove obsolete InvalidAtom handler in _add_pkg_dep_string().
svn path=/main/trunk/; revision=14283
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 5b03dc3..e4affdf 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -1148,23 +1148,16 @@
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)
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 3ea8b3b..e841650 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -213,10 +213,10 @@
object.__setattr__(self, '_encoding', encoding)
object.__setattr__(self, '_overrides', overrides)
- def __getattribute__(self, attr):
- result = getattr(object.__getattribute__(self, '_mod'), attr)
- encoding = object.__getattribute__(self, '_encoding')
- overrides = object.__getattribute__(self, '_overrides')
+ def __getattr__(self, attr):
+ result = getattr(self._mod, attr)
+ encoding = self._encoding
+ overrides = self._overrides
override = None
if overrides is not None:
override = overrides.get(id(result))
