saner handling of selinux_enabled

svn path=/main/branches/2.0/; revision=2070

diff --git a/ChangeLog b/ChangeLog
index afc6080db32c9c59c5fb7018bf1c5da1325e6e14..490e15340d30887b2390d95fea75fa3c275e88b6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,10 @@
     2. /var/cache/edb/world is now /var/lib/portage/world.
     3. /etc/portage/profile/virtuals is _USER_ configs only.
 
+  01 Oct 2005; Brian Harring <ferringb@gentoo.org> pym/portage.py:
+  selinux_enabled tweak, instead of relying on exception thrown on import,
+  check the actual enabled value (forward compatibility).
+
   01 Oct 2005; Brian Harring <ferringb@gentoo.org> bin/repoman:
   Touch ups to file.name check.
 

diff --git a/pym/portage.py b/pym/portage.py
index fbb7711b6d20d7460d1ca9d1e9acd8e0866aba0f..2137a7b8743bb78f39e5ef6d2e3697553e3f23b9 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -7253,7 +7253,10 @@ settings.lock()
 if 'selinux' in settings["USE"].split(" "):
        try:
                import selinux
-               selinux_enabled=1
+               if hasattr(selinux, "enabled"):
+                       selinux_enabled = selinux.enabled
+               else:
+                       selinux_enabled = 1
        except OSError, e:
                writemsg(red("!!! SELinux not loaded: ")+str(e)+"\n")
                selinux_enabled=0