diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-02-23 23:40:24 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-02-23 23:40:24 +0000 |
| commit | 3962a56122fcea948b851bf122c869d2555559c2 (patch) | |
| tree | 3b0cf2695a75a813845f617db54ed7370ec94f1f /bin | |
| parent | 5d0f42d74de3e311998dc6b225f30d06b37f704f (diff) | |
| download | portage-3962a56122fcea948b851bf122c869d2555559c2.tar.gz portage-3962a56122fcea948b851bf122c869d2555559c2.tar.bz2 portage-3962a56122fcea948b851bf122c869d2555559c2.zip | |
As requested by solar, never show a merge list unless it's explicitly requested by --ask, --pretend, or --tree.
svn path=/main/branches/2.1.2/; revision=6063
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/emerge | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/bin/emerge b/bin/emerge index 1fa1a2dc6..fdd9c504b 100755 --- a/bin/emerge +++ b/bin/emerge @@ -4709,6 +4709,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"]) |