Bug #283513 - Do not allow --noreplace together with --emptytree since it

results in bogus masking messages.

svn path=/main/trunk/; revision=14181

diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index 9115a25d65b45e20a0e8dde54937fd1ac0697049..543a0080dc781cb34b5b68148cab74098ea81071 100644 (file)
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -1143,6 +1143,12 @@ def emerge_main():
                print "emerge: can't specify both of \"--tree\" and \"--columns\"."
                return 1
 
+       if '--emptytree' in myopts and '--noreplace' in myopts:
+               writemsg_level("emerge: can't specify both of " + \
+                       "\"--empty\" and \"--noreplace\".\n",
+                       level=logging.ERROR, noiselevel=-1)
+               return 1
+
        if ("--quiet" in myopts):
                spinner.update = spinner.update_quiet
                portage.util.noiselimit = -1