diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-02-23 23:39:28 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-02-23 23:39:28 +0000 |
| commit | 544273b5584d139b62ad464eed96e844e33a990d (patch) | |
| tree | 812a7e9eef4ea5516667feb173fde77d2868453a /pym | |
| parent | cf8c2092beef7260b0ac33ec123cda81c72e89f5 (diff) | |
| download | portage-544273b5584d139b62ad464eed96e844e33a990d.tar.gz portage-544273b5584d139b62ad464eed96e844e33a990d.tar.bz2 portage-544273b5584d139b62ad464eed96e844e33a990d.zip | |
As requested by solar, never show a merge list unless it's explicitly requested by --ask, --pretend, or --tree.
svn path=/main/trunk/; revision=6062
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/emerge/__init__.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py index 03b3031de..8c418447d 100644 --- a/pym/emerge/__init__.py +++ b/pym/emerge/__init__.py @@ -4769,6 +4769,7 @@ def action_build(settings, trees, mtimedb, sys.exit(1) if "--pretend" not in myopts and \ + ("--ask" in myopts or "--tree" in myopts) and \ not ("--quiet" in myopts and "--ask" not in myopts): if "--resume" in myopts: validate_merge_list(trees, mtimedb["resume"]["mergelist"]) |