From: Brian Harring Date: Sun, 2 Oct 2005 03:52:41 +0000 (-0000) Subject: saner handling of selinux_enabled X-Git-Tag: v2.0.53_rc4_2111~26 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5a885ab7bd42e08c43294c94b6a6b5308476f8c1;p=portage.git saner handling of selinux_enabled svn path=/main/branches/2.0/; revision=2070 --- diff --git a/ChangeLog b/ChangeLog index afc6080db..490e15340 100644 --- 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 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 bin/repoman: Touch ups to file.name check. 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