diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-02-23 23:52:43 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-02-23 23:52:43 +0000 |
| commit | 2d4240c952e9518701887ff4747ad290ae8ec738 (patch) | |
| tree | 71b865cfaab9b200e4f5e971818a3ee0b2b88130 /bin | |
| parent | 3962a56122fcea948b851bf122c869d2555559c2 (diff) | |
| download | portage-2d4240c952e9518701887ff4747ad290ae8ec738.tar.gz portage-2d4240c952e9518701887ff4747ad290ae8ec738.tar.bz2 portage-2d4240c952e9518701887ff4747ad290ae8ec738.zip | |
As requested by solar, never show a merge list unless it's explicitly requested by --ask, --pretend, or --tree. (trunk r6064)
svn path=/main/branches/2.1.2/; revision=6065
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/emerge | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/emerge b/bin/emerge index fdd9c504b..4193a9bff 100755 --- a/bin/emerge +++ b/bin/emerge @@ -4619,7 +4619,8 @@ def action_build(settings, trees, mtimedb, myopts, myaction, myfiles, spinner): ldpath_mtimes = mtimedb["ldpath"] favorites=[] - if "--quiet" not in myopts: + if "--quiet" not in myopts and \ + ("--pretend" in myopts or "--ask" in myopts or "--tree" in myopts): action = "" if "--fetchonly" in myopts or "--fetch-all-uri" in myopts: action = "fetched" |