| 1 |
Author: zmedico |
| 2 |
Date: 2010-01-29 18:43:50 +0000 (Fri, 29 Jan 2010) |
| 3 |
New Revision: 15227 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.7/pym/portage/__init__.py |
| 7 |
Log: |
| 8 |
Bug #298310 - Make sure the _selinux attribute is correctly reinitialized after |
| 9 |
reload(portage) is called. (trunk r15159) |
| 10 |
|
| 11 |
Modified: main/branches/2.1.7/pym/portage/__init__.py |
| 12 |
=================================================================== |
| 13 |
--- main/branches/2.1.7/pym/portage/__init__.py 2010-01-29 18:43:41 UTC (rev 15226) |
| 14 |
+++ main/branches/2.1.7/pym/portage/__init__.py 2010-01-29 18:43:50 UTC (rev 15227) |
| 15 |
@@ -293,6 +293,9 @@ |
| 16 |
_selinux_merge = None |
| 17 |
try: |
| 18 |
import portage._selinux |
| 19 |
+ # Make sure the _selinux attribute is correctly reinitialized after |
| 20 |
+ # reload(portage) is called. See bug #298310. |
| 21 |
+ _selinux = sys.modules['portage._selinux'] |
| 22 |
selinux = _unicode_module_wrapper(_selinux, |
| 23 |
encoding=_encodings['fs']) |
| 24 |
_selinux_merge = _unicode_module_wrapper(_selinux, |
Archives