summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Harring <ferringb@gentoo.org>2005-09-20 13:13:10 +0000
committerBrian Harring <ferringb@gentoo.org>2005-09-20 13:13:10 +0000
commit52b6e16768a132f2248adf1ff6e2dacf77f01769 (patch)
tree90a907c9e7e27ad5b1baa37a5a2d13976fa16c3e
parent0a520e5ee483fc280abe8308efbfcdd126f74d30 (diff)
downloadportage-52b6e16768a132f2248adf1ff6e2dacf77f01769.tar.gz
portage-52b6e16768a132f2248adf1ff6e2dacf77f01769.tar.bz2
portage-52b6e16768a132f2248adf1ff6e2dacf77f01769.zip
bug 106363 , selinux failed import resulting in module hanging around causing issues for the logic on the next re-import
import selinux == fail; next attempt, import selinux == non-fail Python 'feature' of sorts. svn path=/main/branches/2.0/; revision=2011
-rw-r--r--ChangeLog3
-rw-r--r--pym/portage.py5
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index bedbc095c..1be33d5a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,9 @@
2. /var/cache/edb/world is now /var/lib/portage/world.
3. /etc/portage/profile/virtuals is _USER_ configs only.
+ 20 Sep 2005; Brian Harring <ferringb@gentoo.org> pym/portage.py:
+ Cleanup after python, remove module from sys.modules that was a failed import.
+
18 Sep 2005; Mike Frysinger <vapier@gentoo.org> bin/etc-update:
Make sure diff works before checking config files #48184.
diff --git a/pym/portage.py b/pym/portage.py
index d264ef68e..ef9e9b5c7 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -7164,6 +7164,11 @@ if 'selinux' in settings["USE"].split(" "):
except ImportError:
writemsg(red("!!! SELinux module not found.")+" Please verify that it was installed.\n")
selinux_enabled=0
+ if selinux_enabled == 0:
+ try:
+ del sys.modules["selinux"]
+ except KeyError:
+ pass
else:
selinux_enabled=0