summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-01-29 18:43:50 +0000
committerZac Medico <zmedico@gentoo.org>2010-01-29 18:43:50 +0000
commitf4c00ba7091a6f8fa3e346ed54d2e338757208b0 (patch)
tree85752ff9b5dccfafb4f81256d94bcfe89b557b15
parent3eb61d3f813520b760d108bb9cc43b47fc4805d9 (diff)
downloadportage-f4c00ba7091a6f8fa3e346ed54d2e338757208b0.tar.gz
portage-f4c00ba7091a6f8fa3e346ed54d2e338757208b0.tar.bz2
portage-f4c00ba7091a6f8fa3e346ed54d2e338757208b0.zip
Bug #298310 - Make sure the _selinux attribute is correctly reinitialized after
reload(portage) is called. (trunk r15159) svn path=/main/branches/2.1.7/; revision=15227
-rw-r--r--pym/portage/__init__.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 0c03dcb6c..7e148a354 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -293,6 +293,9 @@ selinux = None
_selinux_merge = None
try:
import portage._selinux
+ # Make sure the _selinux attribute is correctly reinitialized after
+ # reload(portage) is called. See bug #298310.
+ _selinux = sys.modules['portage._selinux']
selinux = _unicode_module_wrapper(_selinux,
encoding=_encodings['fs'])
_selinux_merge = _unicode_module_wrapper(_selinux,