diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2007-02-23 21:26:48 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-02-23 21:26:48 +0000 |
| commit | 627b80e005628d6773b3de6622792525e847ab7e (patch) | |
| tree | cbd180290b70573f94e5ee68b875832d64893229 | |
| parent | Make verify_all() return an "insufficient data" error if there is not at leas... (diff) | |
| download | portage-multirepo-627b80e005628d6773b3de6622792525e847ab7e.tar.gz portage-multirepo-627b80e005628d6773b3de6622792525e847ab7e.tar.bz2 portage-multirepo-627b80e005628d6773b3de6622792525e847ab7e.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. (trunk r6057:6058)
svn path=/main/branches/2.1.2/; revision=6059
| -rwxr-xr-x | bin/emerge | 15 |
1 files changed, 8 insertions, 7 deletions
@@ -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: |