Move the --sync and --metadata code from global scope to a function.

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

diff --git a/bin/emerge b/bin/emerge
index ec81f8be1d2d5108a840465e8532934389c47d19..65aa4bde34c6fd52019b9239ff8bccaecebeb803 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -2725,11 +2725,7 @@ def validate_merge_list(mergelist):
 if "--debug" in myopts:
        edebug=1
 
-if myaction in ["sync","metadata"] and (not "--help" in myopts):
-       if "--pretend" in myopts:
-               print "emerge: \"sync\" actions do not support \"--pretend.\""
-               sys.exit(1)
-
+def action_sync():
        emergelog(" === "+str(myaction))
        myportdir=portage.settings["PORTDIR"]
        if myportdir[-1]=="/":
@@ -3168,6 +3164,12 @@ if myaction in ["sync","metadata"] and (not "--help" in myopts):
                print red(" * ")+"configuration files."
                print red(" * ")+"To update portage, run 'emerge portage'."
                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":
        emergelog(" === regen")
        #regenerate cache entries