| 1 |
Author: zmedico |
| 2 |
Date: 2009-09-03 03:25:26 +0000 (Thu, 03 Sep 2009) |
| 3 |
New Revision: 14181 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/main.py |
| 7 |
Log: |
| 8 |
Bug #283513 - Do not allow --noreplace together with --emptytree since it |
| 9 |
results in bogus masking messages. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/_emerge/main.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/_emerge/main.py 2009-09-03 01:06:52 UTC (rev 14180) |
| 15 |
+++ main/trunk/pym/_emerge/main.py 2009-09-03 03:25:26 UTC (rev 14181) |
| 16 |
@@ -1143,6 +1143,12 @@ |
| 17 |
print "emerge: can't specify both of \"--tree\" and \"--columns\"." |
| 18 |
return 1 |
| 19 |
|
| 20 |
+ if '--emptytree' in myopts and '--noreplace' in myopts: |
| 21 |
+ writemsg_level("emerge: can't specify both of " + \ |
| 22 |
+ "\"--empty\" and \"--noreplace\".\n", |
| 23 |
+ level=logging.ERROR, noiselevel=-1) |
| 24 |
+ return 1 |
| 25 |
+ |
| 26 |
if ("--quiet" in myopts): |
| 27 |
spinner.update = spinner.update_quiet |
| 28 |
portage.util.noiselimit = -1 |
Archives