summaryrefslogtreecommitdiffstats
path: root/pym
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-02-18 22:21:42 +0000
committerZac Medico <zmedico@gentoo.org>2007-02-18 22:21:42 +0000
commit440bfc7b62d99c1b699370c842d82e86ebd46bfa (patch)
treece735c7843f76c25d5957f417c16281b313759c3 /pym
parentf100a07ff12076a5b6d781ec47ff515d29510b4f (diff)
downloadportage-440bfc7b62d99c1b699370c842d82e86ebd46bfa.tar.gz
portage-440bfc7b62d99c1b699370c842d82e86ebd46bfa.tar.bz2
portage-440bfc7b62d99c1b699370c842d82e86ebd46bfa.zip
For bug #166880, always display the merge list header.
svn path=/main/trunk/; revision=6000
Diffstat (limited to 'pym')
-rw-r--r--pym/emerge/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index c867f06b2..002e7f9dd 100644
--- a/pym/emerge/__init__.py
+++ b/pym/emerge/__init__.py
@@ -4645,7 +4645,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"