summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-08-14 07:01:32 +0000
committerZac Medico <zmedico@gentoo.org>2009-08-14 07:01:32 +0000
commit789dd0e91ed3a1faa60ae1f4a6172b483717e622 (patch)
tree196181b7b868f2bd8cf55898d24faf98ccb310d9
parent762248367c097290cc3a6998bbad40f797f9e9c4 (diff)
downloadportage-789dd0e91ed3a1faa60ae1f4a6172b483717e622.tar.gz
portage-789dd0e91ed3a1faa60ae1f4a6172b483717e622.tar.bz2
portage-789dd0e91ed3a1faa60ae1f4a6172b483717e622.zip
Don't 'del sys.modules["selinux"]' when selinux support isn't enabled in
the portage config, because that just assumes too much. svn path=/main/trunk/; revision=14026
-rw-r--r--pym/portage/__init__.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 6cff57d8f..f20284e30 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -3680,11 +3680,7 @@ class config(object):
writemsg("!!! SELinux module not found. Please verify that it was installed.\n",
noiselevel=-1)
self._selinux_enabled = 0
- if self._selinux_enabled == 0:
- try:
- del sys.modules["selinux"]
- except KeyError:
- pass
+
return self._selinux_enabled
if sys.hexversion >= 0x3000000: