| 1 |
Author: zmedico |
| 2 |
Date: 2009-06-30 09:15:52 +0000 (Tue, 30 Jun 2009) |
| 3 |
New Revision: 13743 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/__init__.py |
| 7 |
Log: |
| 8 |
Bug #275901 - Make emerge bail out for USE deps in EAPI 0 and 1. |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/trunk/pym/portage/__init__.py |
| 12 |
=================================================================== |
| 13 |
--- main/trunk/pym/portage/__init__.py 2009-06-30 04:39:07 UTC (rev 13742) |
| 14 |
+++ main/trunk/pym/portage/__init__.py 2009-06-30 09:15:52 UTC (rev 13743) |
| 15 |
@@ -6909,6 +6909,10 @@ |
| 16 |
eapi in ("0", "1") and portage.dep._dep_check_strict: |
| 17 |
raise portage.exception.ParseError( |
| 18 |
"invalid atom: '%s'" % (x,)) |
| 19 |
+ if x.use and eapi in ("0", "1") and \ |
| 20 |
+ portage.dep._dep_check_strict: |
| 21 |
+ raise portage.exception.ParseError( |
| 22 |
+ "invalid atom: '%s'" % (x,)) |
| 23 |
|
| 24 |
if repoman and x.use and x.use.conditional: |
| 25 |
evaluated_atom = portage.dep.remove_slot(x) |
Archives