Move the --info code from global scope to a function.

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

diff --git a/bin/emerge b/bin/emerge
index cf50cc8b3484355ff4653ec1c8c65498356a89c6..2b4f9359773dc03f53cc990d1bffdfb578ab2dea 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -3247,19 +3247,7 @@ def action_config():
        portage.doebuild(ebuildpath,"config",portage.root,mysettings,debug=("--debug" in myopts),cleanup=True,tree="vartree")
        print
 
-if myaction in ["sync","metadata"] and "--help" not in myopts:
-       if "--pretend" in myopts:
-               print "emerge: \"sync\" actions do not support \"--pretend.\""
-               sys.exit(1)
-       action_sync()
-elif myaction=="regen":
-       action_regen()
-# HELP action
-elif "config"==myaction:
-       action_config()
-
-# INFO action
-elif "info"==myaction:
+def action_info():
        unameout=commands.getstatusoutput("uname -mrp")[1]
        print getportageversion()
        print "================================================================="
@@ -3339,6 +3327,21 @@ elif "info"==myaction:
                        if "cvs_id_string" in dir(module):
                                print "%s: %s" % (str(x), str(module.cvs_id_string))
 
+if myaction in ["sync","metadata"] and "--help" not in myopts:
+       if "--pretend" in myopts:
+               print "emerge: \"sync\" actions do not support \"--pretend.\""
+               sys.exit(1)
+       action_sync()
+elif myaction=="regen":
+       action_regen()
+# HELP action
+elif "config"==myaction:
+       action_config()
+
+# INFO action
+elif "info"==myaction:
+       action_info()
+
 # SEARCH action
 elif "search"==myaction:
        if not myfiles: