Make sure portage.selinux and _selinux exist, even when import fails, so

that 'from portage import selinux' never fails inside vartree.py.

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

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 76bfcbc442e088231c10c6782f88e723e316bd2d..6cff57d8f20551d211800a53a1cfb529ef602bfa 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -214,7 +214,8 @@ import shutil as _shutil
 shutil = _unicode_module_wrapper(_shutil)
 
 # Imports below this point rely on the above unicode wrapper definitions.
-
+_selinux = None
+selinux = None
 try:
        import portage._selinux
        selinux = _unicode_module_wrapper(_selinux)
@@ -3670,7 +3671,7 @@ class config(object):
                if getattr(self, "_selinux_enabled", None) is None:
                        self._selinux_enabled = 0
                        if "selinux" in self["USE"].split():
-                               if "selinux" in globals():
+                               if selinux:
                                        if selinux.is_selinux_enabled() == 1:
                                                self._selinux_enabled = 1
                                        else: