diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-02-18 22:22:15 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-02-18 22:22:15 +0000 |
| commit | aa21fb1d552a77baf3e85ec24463b3c497c2680f (patch) | |
| tree | 6603d0f78e60e2c54e618ffd9a5e0ace46112c55 | |
| parent | c647cf3331d396e4860187d870c27be578d4f233 (diff) | |
| download | portage-aa21fb1d552a77baf3e85ec24463b3c497c2680f.tar.gz portage-aa21fb1d552a77baf3e85ec24463b3c497c2680f.tar.bz2 portage-aa21fb1d552a77baf3e85ec24463b3c497c2680f.zip | |
For bug #166880, always display the merge list header. (trunk r5999:6000)
svn path=/main/branches/2.1.2/; revision=6001
| -rwxr-xr-x | bin/emerge | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/emerge b/bin/emerge index 55a63aa36..cd19e2640 100755 --- a/bin/emerge +++ b/bin/emerge @@ -4584,7 +4584,7 @@ def action_build(settings, trees, mtimedb, myopts, myaction, myfiles, spinner): ldpath_mtimes = mtimedb["ldpath"] favorites=[] - if ("--ask" in myopts or "--pretend" in myopts) and not "--quiet" in myopts: + if "--quiet" not in myopts: action = "" if "--fetchonly" in myopts or "--fetch-all-uri" in myopts: action = "fetched" |