diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-02-23 23:52:14 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-02-23 23:52:14 +0000 |
| commit | 27a4b756088d78fe82787d3481607e4d1fa14914 (patch) | |
| tree | eed0caa01ec0b1be012a060f7d51b3f1a59877c4 /pym | |
| parent | 544273b5584d139b62ad464eed96e844e33a990d (diff) | |
| download | portage-27a4b756088d78fe82787d3481607e4d1fa14914.tar.gz portage-27a4b756088d78fe82787d3481607e4d1fa14914.tar.bz2 portage-27a4b756088d78fe82787d3481607e4d1fa14914.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=6064
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 8c418447d..dc63b6b10 100644 --- a/pym/emerge/__init__.py +++ b/pym/emerge/__init__.py @@ -4679,7 +4679,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" |