diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-02-02 19:41:10 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-02-02 19:41:10 -0800 |
| commit | 93328d0d02f4f0f6ce3fbaad93e978148a130238 (patch) | |
| tree | 5aa05ded28c44340fab7faf0d05338a46427afe4 /pym/_emerge | |
| parent | e3c8e4177b6b30643f4527d51e544cb08fab7f9b (diff) | |
| download | portage-93328d0d02f4f0f6ce3fbaad93e978148a130238.tar.gz portage-93328d0d02f4f0f6ce3fbaad93e978148a130238.tar.bz2 portage-93328d0d02f4f0f6ce3fbaad93e978148a130238.zip | |
depgraph: rm obsolete AmbguousPackageName handler
Diffstat (limited to 'pym/_emerge')
| -rw-r--r-- | pym/_emerge/depgraph.py | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 05ca1872e..920cd215f 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -1174,8 +1174,8 @@ class depgraph(object): debug = "--debug" in self._frozen_config.myopts strict = mytype != "installed" - try: - for dep_root, dep_string, dep_priority, ignore_blockers in deps: + + for dep_root, dep_string, dep_priority, ignore_blockers in deps: if not dep_string: continue if debug: @@ -1229,25 +1229,6 @@ class depgraph(object): allow_unsatisfied, ignore_blockers=ignore_blockers): return 0 - except portage.exception.AmbiguousPackageName as e: - pkgs = e.args[0] - portage.writemsg("\n\n!!! An atom in the dependencies " + \ - "is not fully-qualified. Multiple matches:\n\n", noiselevel=-1) - for cpv in pkgs: - portage.writemsg(" %s\n" % cpv, noiselevel=-1) - portage.writemsg("\n", noiselevel=-1) - if mytype == "binary": - portage.writemsg( - "!!! This binary package cannot be installed: '%s'\n" % \ - mykey, noiselevel=-1) - elif mytype == "ebuild": - portdb = self._frozen_config.roots[myroot].trees["porttree"].dbapi - myebuild, mylocation = portdb.findname2(mykey, myrepo = pkg.repo) - portage.writemsg("!!! This ebuild cannot be installed: " + \ - "'%s'\n" % myebuild, noiselevel=-1) - portage.writemsg("!!! Please notify the package maintainer " + \ - "that atoms must be fully-qualified.\n", noiselevel=-1) - return 0 self._dynamic_config._traversed_pkg_deps.add(pkg) return 1 |