From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 23 Feb 2007 21:26:13 +0000 (-0000)
Subject: Do not show the spinner and the "Calculating dependencies" message for installation... 
X-Git-Tag: v2.2_pre1~1651
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2edf3d59b5dc09b2f53ab3e1e1ecb1afb64c13bf;p=portage.git

Do not show the spinner and the "Calculating dependencies" message for installation actions when the --nodeps option has been specified.  Thanks to David Watzke <david@watzke.cz> for this patch from bug #168169.

svn path=/main/trunk/; revision=6058
---

diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index f96db811e..03b3031de 100644
--- a/pym/emerge/__init__.py
+++ b/pym/emerge/__init__.py
@@ -1093,7 +1093,8 @@ class depgraph:
 						priority=priority)
 			return 1
 		
-		self.spinner.update()
+		if "--nodeps" not in self.myopts:
+			self.spinner.update()
 		if mytype == "blocks":
 			if myparent and \
 				"--buildpkgonly" not in self.myopts and \
@@ -4721,11 +4722,11 @@ def action_build(settings, trees, mtimedb,
 				myresumeopts[myopt] = myarg
 		myopts=myresumeopts
 		myparams = create_depgraph_params(myopts, myaction)
-		if not "--quiet" in myopts:
+		if "--quiet" not in myopts and "--nodeps" not in myopts:
 			print "Calculating dependencies  ",
 		mydepgraph = depgraph(settings, trees,
 			myopts, myparams, spinner)
-		if not "--quiet" in myopts:
+		if "--quiet" not in myopts and "--nodeps" not in myopts:
 			print "\b\b... done!"
 	else:
 		if ("--resume" in myopts):
@@ -4734,17 +4735,17 @@ def action_build(settings, trees, mtimedb,
 
 		myparams = create_depgraph_params(myopts, myaction)
 		if myaction in ["system","world"]:
-			if not ("--quiet" in myopts):
+			if "--quiet" not in myopts and "--nodeps" not in myopts:
 				print "Calculating",myaction,"dependencies  ",
 				sys.stdout.flush()
 			mydepgraph = depgraph(settings, trees, myopts, myparams, spinner)
 			if not mydepgraph.xcreate(myaction):
 				print "!!! Depgraph creation failed."
 				sys.exit(1)
-			if not ("--quiet" in myopts):
+			if "--quiet" not in myopts and "--nodeps" not in myopts:
 				print "\b\b... done!"
 		else:
-			if not ("--quiet" in myopts):
+			if "--quiet" not in myopts and "--nodeps" not in myopts:
 				print "Calculating dependencies  ",
 				sys.stdout.flush()
 			mydepgraph = depgraph(settings, trees, myopts, myparams, spinner)
@@ -4755,7 +4756,7 @@ def action_build(settings, trees, mtimedb,
 				sys.exit(1)
 			if not retval:
 				sys.exit(1)
-			if not ("--quiet" in myopts):
+			if "--quiet" not in myopts and "--nodeps" not in myopts:
 				print "\b\b... done!"
 
 			if ("--usepkgonly" in myopts) and mydepgraph.missingbins: