diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-10-10 20:25:19 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-10-10 20:25:19 +0000 |
| commit | e1b9b9e543b10dd7e062f964884ed28c60870446 (patch) | |
| tree | dfb1d958321d178ed2e75021eefe5a9f26292dc3 /pym/_emerge | |
| parent | 7bb5894209190a2fa20c3899156a92a3313c884e (diff) | |
| download | portage-e1b9b9e543b10dd7e062f964884ed28c60870446.tar.gz portage-e1b9b9e543b10dd7e062f964884ed28c60870446.tar.bz2 portage-e1b9b9e543b10dd7e062f964884ed28c60870446.zip | |
Bug #241132 - Handle AmbiguousPackageName exceptions for atoms passed to the
--info action.
svn path=/main/trunk/; revision=11671
Diffstat (limited to 'pym/_emerge')
| -rw-r--r-- | pym/_emerge/__init__.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 7b4067a88..ba04903a2 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -13983,10 +13983,6 @@ def emerge_main(): elif "config"==myaction: validate_ebuild_environment(trees) action_config(settings, trees, myopts, myfiles) - - # INFO action - elif "info"==myaction: - action_info(settings, trees, myopts, myfiles) # SEARCH action elif "search"==myaction: @@ -14018,7 +14014,7 @@ def emerge_main(): if not (buildpkgonly or fetchonly or pretend): post_emerge(root_config, myopts, mtimedb, os.EX_OK) - elif myaction in ("depclean", "prune"): + elif myaction in ("depclean", "info", "prune"): # Ensure atoms are valid before calling unmerge(). vardb = trees[settings["ROOT"]]["vartree"].dbapi @@ -14049,6 +14045,9 @@ def emerge_main(): level=logging.ERROR, noiselevel=-1) return 1 + if myaction == "info": + return action_info(settings, trees, myopts, valid_atoms) + validate_ebuild_environment(trees) action_depclean(settings, trees, mtimedb["ldpath"], myopts, myaction, valid_atoms, spinner) |