| 1 |
Author: zmedico |
| 2 |
Date: 2008-04-24 03:37:44 +0000 (Thu, 24 Apr 2008) |
| 3 |
New Revision: 9958 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/emerge |
| 7 |
Log: |
| 8 |
Combine --nodeps spinner logic. (trunk r9953) |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/branches/2.1.2/bin/emerge |
| 12 |
=================================================================== |
| 13 |
--- main/branches/2.1.2/bin/emerge 2008-04-24 03:34:07 UTC (rev 9957) |
| 14 |
+++ main/branches/2.1.2/bin/emerge 2008-04-24 03:37:44 UTC (rev 9958) |
| 15 |
@@ -1730,8 +1730,6 @@ |
| 16 |
self.edebug = 0 |
| 17 |
if settings.get("PORTAGE_DEBUG", "") == "1": |
| 18 |
self.edebug = 1 |
| 19 |
- if "--nodeps" in myopts: |
| 20 |
- spinner.update = spinner.update_quiet |
| 21 |
self.spinner = spinner |
| 22 |
self.pkgsettings = {} |
| 23 |
# Maps slot atom to package for each Package added to the graph. |
| 24 |
@@ -7350,6 +7348,10 @@ |
| 25 |
else: |
| 26 |
del mtimedb[k] |
| 27 |
|
| 28 |
+ show_spinner = "--quiet" not in myopts and "--nodeps" not in myopts |
| 29 |
+ if not show_spinner: |
| 30 |
+ spinner.update = spinner.update_quiet |
| 31 |
+ |
| 32 |
if "--resume" in myopts and \ |
| 33 |
("resume" in mtimedb or |
| 34 |
"resume_backup" in mtimedb): |
| 35 |
@@ -7373,9 +7375,6 @@ |
| 36 |
for opt in ("--skipfirst", "--ask", "--tree"): |
| 37 |
resume_opts.pop(opt, None) |
| 38 |
myopts.update(resume_opts) |
| 39 |
- show_spinner = "--quiet" not in myopts and "--nodeps" not in myopts |
| 40 |
- if not show_spinner: |
| 41 |
- spinner.update = spinner.update_quiet |
| 42 |
if show_spinner: |
| 43 |
print "Calculating dependencies ", |
| 44 |
myparams = create_depgraph_params(myopts, myaction) |
| 45 |
|
| 46 |
-- |
| 47 |
gentoo-commits@l.g.o mailing list |
Archives