| 1 |
Author: zmedico |
| 2 |
Date: 2009-06-26 23:01:46 +0000 (Fri, 26 Jun 2009) |
| 3 |
New Revision: 13702 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/bin/repoman |
| 7 |
main/trunk/pym/_emerge/Package.py |
| 8 |
Log: |
| 9 |
Fix PROVIDE code since the Package class automatically evaluates USE |
| 10 |
conditionals now. |
| 11 |
|
| 12 |
|
| 13 |
Modified: main/trunk/bin/repoman |
| 14 |
=================================================================== |
| 15 |
--- main/trunk/bin/repoman 2009-06-26 22:43:39 UTC (rev 13701) |
| 16 |
+++ main/trunk/bin/repoman 2009-06-26 23:01:46 UTC (rev 13702) |
| 17 |
@@ -1237,14 +1237,15 @@ |
| 18 |
# if x.startswith("no"): |
| 19 |
# print "Bad RESTRICT value: %s" % x |
| 20 |
try: |
| 21 |
- myaux["PROVIDE"] = portage.dep.use_reduce( |
| 22 |
+ portage.dep.use_reduce( |
| 23 |
portage.dep.paren_reduce(myaux["PROVIDE"]), matchall=1) |
| 24 |
except portage.exception.InvalidDependString, e: |
| 25 |
stats["PROVIDE.syntax"] = stats["PROVIDE.syntax"] + 1 |
| 26 |
fails["PROVIDE.syntax"].append(mykey+".ebuild PROVIDE: "+str(e)) |
| 27 |
del e |
| 28 |
continue |
| 29 |
- myaux["PROVIDE"] = " ".join(portage.flatten(myaux["PROVIDE"])) |
| 30 |
+ |
| 31 |
+ # The Package class automatically evaluates USE conditionals. |
| 32 |
for myprovide in myaux["PROVIDE"].split(): |
| 33 |
prov_cp = portage.dep_getkey(myprovide) |
| 34 |
if prov_cp != myprovide: |
| 35 |
|
| 36 |
Modified: main/trunk/pym/_emerge/Package.py |
| 37 |
=================================================================== |
| 38 |
--- main/trunk/pym/_emerge/Package.py 2009-06-26 22:43:39 UTC (rev 13701) |
| 39 |
+++ main/trunk/pym/_emerge/Package.py 2009-06-26 23:01:46 UTC (rev 13702) |
| 40 |
@@ -185,8 +185,12 @@ |
| 41 |
if k in self._use_conditional_keys: |
| 42 |
if '?' in v: |
| 43 |
try: |
| 44 |
- v = paren_enclose(paren_normalize(use_reduce( |
| 45 |
- paren_reduce(v), uselist=self._pkg.use.enabled))) |
| 46 |
+ if self._pkg.root_config.settings.local_config: |
| 47 |
+ v = paren_enclose(paren_normalize(use_reduce( |
| 48 |
+ paren_reduce(v), uselist=self._pkg.use.enabled))) |
| 49 |
+ else: |
| 50 |
+ v = paren_enclose(paren_normalize(use_reduce( |
| 51 |
+ paren_reduce(v), matchall=1))) |
| 52 |
except portage.exception.InvalidDependString: |
| 53 |
# This error should already have been registered via |
| 54 |
# self._pkg._invalid_metadata(). |
Archives