| 1 |
Author: zmedico |
| 2 |
Date: 2008-02-28 10:12:32 +0000 (Thu, 28 Feb 2008) |
| 3 |
New Revision: 9393 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/__init__.py |
| 7 |
Log: |
| 8 |
Fix some references to config["PORTAGE_USE"] to prevent potential |
| 9 |
KeyErrors. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/portage/__init__.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/portage/__init__.py 2008-02-27 19:43:45 UTC (rev 9392) |
| 15 |
+++ main/trunk/pym/portage/__init__.py 2008-02-28 10:12:32 UTC (rev 9393) |
| 16 |
@@ -1913,7 +1913,7 @@ |
| 17 |
if "test" in self.features: |
| 18 |
test_use_changed = \ |
| 19 |
bool(re.search(r'(^|\s)[-+]?test(\s|$)', iuse)) != \ |
| 20 |
- ("test" in self.get("PORTAGE_USE","").split()) |
| 21 |
+ ("test" in self["USE"].split()) |
| 22 |
if self.get("EBUILD_PHASE") or \ |
| 23 |
self._use_wildcards or \ |
| 24 |
test_use_changed: |
| 25 |
@@ -2677,7 +2677,7 @@ |
| 26 |
mydict[k] = v |
| 27 |
|
| 28 |
# Filtered by IUSE and implicit IUSE. |
| 29 |
- mydict["USE"] = self["PORTAGE_USE"] |
| 30 |
+ mydict["USE"] = self.get("PORTAGE_USE", "") |
| 31 |
|
| 32 |
# sandbox's bashrc sources /etc/profile which unsets ROOTPATH, |
| 33 |
# so we have to back it up and restore it. |
| 34 |
@@ -2703,7 +2703,7 @@ |
| 35 |
def selinux_enabled(self): |
| 36 |
if getattr(self, "_selinux_enabled", None) is None: |
| 37 |
self._selinux_enabled = 0 |
| 38 |
- if "selinux" in self["PORTAGE_USE"].split(): |
| 39 |
+ if "selinux" in self["USE"].split(): |
| 40 |
if "selinux" in globals(): |
| 41 |
if selinux.is_selinux_enabled() == 1: |
| 42 |
self._selinux_enabled = 1 |
| 43 |
|
| 44 |
-- |
| 45 |
gentoo-commits@l.g.o mailing list |
Archives