From: Ned Ludd <solar@gentoo.org>
Date: Mon, 19 Jun 2006 01:37:30 +0000 (-0000)
Subject: - do not complain about redundant use of pretend and verbose flags
X-Git-Tag: v2.1.1~461
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=994e23cd7f2504b7e8bc5d26a00dfa1e84e9def9;p=portage.git

- do not complain about redundant use of pretend and verbose flags

svn path=/main/trunk/; revision=3534
---

diff --git a/bin/emerge b/bin/emerge
index 8cd9f3676..5ff9f07ac 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -258,8 +258,9 @@ for x in tmpcmdline:
 		for y in x[1:]:
 			if shortmapping.has_key(y):
 				if shortmapping[y] in cmdline:
-					print
-					print "*** Warning: Redundant use of",shortmapping[y]
+					if not shortmapping[y] in ("--verbose", "--pretend"):
+						print
+						print "*** Warning: Redundant use of",shortmapping[y]
 				else:
 					cmdline.append(shortmapping[y])
 			else: