diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-02-20 21:25:03 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-02-20 21:25:03 +0000 |
| commit | 6ac38cf72540a1766c5f2eb372cbf21e0c33a424 (patch) | |
| tree | c0ef4233e560b83b4c174283c645409965e7c0c0 /pym | |
| parent | ec2b3443f9707eee8217aad2cd730a65d6b1036d (diff) | |
| download | portage-6ac38cf72540a1766c5f2eb372cbf21e0c33a424.tar.gz portage-6ac38cf72540a1766c5f2eb372cbf21e0c33a424.tar.bz2 portage-6ac38cf72540a1766c5f2eb372cbf21e0c33a424.zip | |
As requested by vapier, don't show the merge list in --quiet mode unless it's explicitly requested via --ask or --pretend.
svn path=/main/trunk/; revision=6017
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/emerge/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py index 50e91d64c..c0072d2f8 100644 --- a/pym/emerge/__init__.py +++ b/pym/emerge/__init__.py @@ -4764,7 +4764,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"] |