diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2007-02-20 21:30:44 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-02-20 21:30:44 +0000 |
| commit | 684fe497d9b2dd09ae3ec9290b5c503255838b41 (patch) | |
| tree | b4e88597e66d1fae10cfdf19816a3f8556b48eca /bin | |
| parent | For bug #167217, don't hardcode /usr/lib/portage. (trunk r5945) (diff) | |
| download | portage-multirepo-684fe497d9b2dd09ae3ec9290b5c503255838b41.tar.gz portage-multirepo-684fe497d9b2dd09ae3ec9290b5c503255838b41.tar.bz2 portage-multirepo-684fe497d9b2dd09ae3ec9290b5c503255838b41.zip | |
As requested by vapier, don't show the merge list in --quiet mode unless it's explicitly requested via --ask or --pretend. (trunk r6016:6017)
svn path=/main/branches/2.1.2/; revision=6018
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/emerge | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -4704,7 +4704,8 @@ def action_build(settings, trees, mtimedb, sys.stderr.write("\nThese are required by '--usepkgonly' -- Terminating.\n\n") sys.exit(1) - if "--pretend" not in myopts: + if "--pretend" not in myopts and \ + not ("--quiet" in myopts and "--ask" not in myopts): if "--resume" in myopts: validate_merge_list(trees, mtimedb["resume"]["mergelist"]) mymergelist = mtimedb["resume"]["mergelist"] |