summaryrefslogtreecommitdiffstats
path: root/pym
diff options
context:
space:
mode:
authorBrian Harring <ferringb@gentoo.org>2005-10-02 03:52:41 +0000
committerBrian Harring <ferringb@gentoo.org>2005-10-02 03:52:41 +0000
commit5a885ab7bd42e08c43294c94b6a6b5308476f8c1 (patch)
tree0f1ead54b28829914e617698b0e68df3e9b07b31 /pym
parent91a79859f5c785b09e1215cebcdc194d3fa3cb41 (diff)
downloadportage-5a885ab7bd42e08c43294c94b6a6b5308476f8c1.tar.gz
portage-5a885ab7bd42e08c43294c94b6a6b5308476f8c1.tar.bz2
portage-5a885ab7bd42e08c43294c94b6a6b5308476f8c1.zip
saner handling of selinux_enabled
svn path=/main/branches/2.0/; revision=2070
Diffstat (limited to 'pym')
-rw-r--r--pym/portage.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/pym/portage.py b/pym/portage.py
index fbb7711b6..2137a7b87 100644
--- 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