From 27a4b756088d78fe82787d3481607e4d1fa14914 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 23 Feb 2007 23:52:14 +0000 Subject: 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 --- pym/emerge/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pym/emerge/__init__.py') 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" -- cgit v1.2.3-1-g7c22