summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNed Ludd <solar@gentoo.org>2006-06-19 01:37:30 +0000
committerNed Ludd <solar@gentoo.org>2006-06-19 01:37:30 +0000
commit994e23cd7f2504b7e8bc5d26a00dfa1e84e9def9 (patch)
treec76dd34fc8f7c8f22a25b51c459a46ecd8a8b446
parent605c793707dc54215de85fd9d1072811f1d1100d (diff)
downloadportage-994e23cd7f2504b7e8bc5d26a00dfa1e84e9def9.tar.gz
portage-994e23cd7f2504b7e8bc5d26a00dfa1e84e9def9.tar.bz2
portage-994e23cd7f2504b7e8bc5d26a00dfa1e84e9def9.zip
- do not complain about redundant use of pretend and verbose flags
svn path=/main/trunk/; revision=3534
-rwxr-xr-xbin/emerge5
1 files changed, 3 insertions, 2 deletions
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: