- 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 8cd9f367640f7a5da30153d4503cf5111c5860d9..5ff9f07ace23fed8277a190592162ad765b829dc 100755 (executable)
--- 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: