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

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

diff --git a/bin/emerge b/bin/emerge
index a07eae625dd6e01aa4eb99c86d4eaf9dd1377fcf..dc807ec1758cc6e89337fbf63cceba2dd796fb3a 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -3191,15 +3191,7 @@ def action_regen():
                                print "\n  error processing %(cpv)s, continuing... (%(e)s)" % {"cpv":y,"e":str(e)}
        print "done!"
 
-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:
+def action_config():
        if len(myfiles) != 1 or "system" in myfiles or "world" in myfiles:
                print red("!!! config can only take a single package atom at this time\n")
                sys.exit(1)
@@ -3254,6 +3246,17 @@ elif "config"==myaction:
        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:
        unameout=commands.getstatusoutput("uname -mrp")[1]