Fix broken _selinux_merge definition.

svn path=/main/trunk/; revision=14057

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 9b7c6c01f82725711e6c84269223e196ad5b1ba1..f8f0e222c60571853d40903b155f7e29bbfaa2ea 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -223,10 +223,11 @@ shutil = _unicode_module_wrapper(_shutil, encoding=_fs_encoding)
 # Imports below this point rely on the above unicode wrapper definitions.
 _selinux = None
 selinux = None
-_selinux_merge = _unicode_module_wrapper(_selinux, encoding=_merge_encoding)
+_selinux_merge = None
 try:
        import portage._selinux
        selinux = _unicode_module_wrapper(_selinux, encoding=_fs_encoding)
+       _selinux_merge = _unicode_module_wrapper(_selinux, encoding=_merge_encoding)
 except OSError, e:
        sys.stderr.write("!!! SELinux not loaded: %s\n" % str(e))
        del e