Do not show the spinner and the "Calculating dependencies" message for installation...

svn path=/main/branches/2.1.2/; revision=6059

diff --git a/bin/emerge b/bin/emerge
index 33d6fc354cc37267d4349229550d60ae5551048a..1fa1a2dc6a30999b1e31fbfd4a615ba11ccd126e 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -1091,7 +1091,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 \
@@ -4661,11 +4662,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):
@@ -4674,17 +4675,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)
@@ -4695,7 +4696,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: