From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 14 Aug 2009 06:57:13 +0000 (-0000)
Subject: Make sure portage.selinux and _selinux exist, even when import fails, so
X-Git-Tag: v2.2_rc39~80
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=762248367c097290cc3a6998bbad40f797f9e9c4;p=portage.git

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 76bfcbc44..6cff57d8f 100644
--- 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: