summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-09-03 03:25:26 +0000
committerZac Medico <zmedico@gentoo.org>2009-09-03 03:25:26 +0000
commit81a0324e88d64c5a33041263f2028825dd6aec84 (patch)
treea14808074ee4775798e118c237a38af10ff541f5
parent295e070566dd89f38fe3a8450a06c5f97f839fc4 (diff)
downloadportage-81a0324e88d64c5a33041263f2028825dd6aec84.tar.gz
portage-81a0324e88d64c5a33041263f2028825dd6aec84.tar.bz2
portage-81a0324e88d64c5a33041263f2028825dd6aec84.zip
Bug #283513 - Do not allow --noreplace together with --emptytree since it
results in bogus masking messages. svn path=/main/trunk/; revision=14181
-rw-r--r--pym/_emerge/main.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index 9115a25d6..543a0080d 100644
--- 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