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

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

1 files changed, 25 insertions, 23 deletions

diff --git a/bin/emerge b/bin/emerge
index dab03bd7b..de48bb6bb 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -3342,29 +3342,7 @@ def action_search():
 				sys.exit(1)
 			searchinstance.output()
 
-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:
+def action_depclean():
 	# Kill packages that aren't explicitly merged or are required as a
 	# dependency of another package. World file is explicit.
 
@@ -3486,6 +3464,30 @@ elif "depclean"==myaction:
 		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:
 	favorites=[]