diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-05-27 04:53:11 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-05-27 04:53:11 +0000 |
| commit | fdc974f5da4dd94dce7df1408b8cb4d62256e10f (patch) | |
| tree | 246de0db5dacc11813c63ad1e17e7ca7b15450f8 /pym/portage.py | |
| parent | 2d5a2b8eaa2822f946b4c41b40a9d2bdfcbf51dd (diff) | |
| download | portage-fdc974f5da4dd94dce7df1408b8cb4d62256e10f.tar.gz portage-fdc974f5da4dd94dce7df1408b8cb4d62256e10f.tar.bz2 portage-fdc974f5da4dd94dce7df1408b8cb4d62256e10f.zip | |
Remove dependence on a patched version of libselinux for bug #122517.
svn path=/main/trunk/; revision=3430
Diffstat (limited to 'pym/portage.py')
| -rw-r--r-- | pym/portage.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pym/portage.py b/pym/portage.py index e6834be43..c930816d9 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -115,7 +115,7 @@ except ImportError, e: try: - import selinux + import portage_selinux as selinux except OSError, e: writemsg("!!! SELinux not loaded: %s\n" % str(e), noiselevel=-1) del e @@ -1811,10 +1811,10 @@ class config: self._selinux_enabled = 0 if "selinux" in self["USE"].split(): if "selinux" in globals(): - if hasattr(selinux, "enabled"): - self._selinux_enabled = selinux.enabled - else: + if selinux.is_selinux_enabled() == 1: self._selinux_enabled = 1 + else: + self._selinux_enabled = 0 else: writemsg("!!! SELinux module not found. Please verify that it was installed.\n", noiselevel=-1) |