diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-02-23 21:26:13 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-02-23 21:26:13 +0000 |
| commit | 2edf3d59b5dc09b2f53ab3e1e1ecb1afb64c13bf (patch) | |
| tree | d636992d1fc4ed0ba702f2ad68d8a7395539cc53 | |
| parent | c9e2e14eefcff06c2542a73f1ecdacdbff8f2bac (diff) | |
| download | portage-2edf3d59b5dc09b2f53ab3e1e1ecb1afb64c13bf.tar.gz portage-2edf3d59b5dc09b2f53ab3e1e1ecb1afb64c13bf.tar.bz2 portage-2edf3d59b5dc09b2f53ab3e1e1ecb1afb64c13bf.zip | |
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
| -rw-r--r-- | pym/emerge/__init__.py | 15 |
1 files changed, 8 insertions, 7 deletions
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: |