Bug #241132 - Handle AmbiguousPackageName exceptions for atoms passed to the
authorZac Medico <zmedico@gentoo.org>
Fri, 10 Oct 2008 20:25:19 +0000 (20:25 -0000)
committerZac Medico <zmedico@gentoo.org>
Fri, 10 Oct 2008 20:25:19 +0000 (20:25 -0000)
--info action.

svn path=/main/trunk/; revision=11671

pym/_emerge/__init__.py

index 7b4067a88c7ed8e2aeeb2185a7fb56ac99a062c6..ba04903a271a45ade51873d28ecd08b61ace100d 100644 (file)
@@ -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)