Move emerge's default action code from global scope to a function.

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

diff --git a/bin/emerge b/bin/emerge
index a5c050e911a2e73d778c2a00bece8adcb9c52cc8..41c1df2411e215c405a0e50bc60b8a4d1f765819 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -3464,32 +3464,7 @@ def action_depclean():
                print "Number removed:       "+str(len(cleanlist))
                post_emerge()
 
-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:
-       action_search()
-elif "unmerge"==myaction or "prune"==myaction or "clean"==myaction:
-       if 1 == unmerge(myaction, myfiles, raise_on_missing=False):
-               post_emerge()
-
-elif "depclean"==myaction:
-       action_depclean()
-# "update", "system", or just process files:
-else:
+def action_build(myopts):
        favorites=[]
        syslist=getlist("system")
        if ("--ask" in myopts or "--pretend" in myopts) and not "--quiet" in myopts:
@@ -3657,3 +3632,32 @@ else:
                                + " AUTOCLEAN is disabled.  This can cause serious"
                                + " problems due to overlapping packages.\n")
        post_emerge()
+
+if __name__ == "__main__":
+       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:
+               action_search()
+       elif "unmerge"==myaction or "prune"==myaction or "clean"==myaction:
+               if 1 == unmerge(myaction, myfiles, raise_on_missing=False):
+                       post_emerge()
+       
+       elif "depclean"==myaction:
+               action_depclean()
+       # "update", "system", or just process files:
+       else:
+               action_build(myopts)