summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-09-22 20:28:15 +0000
committerZac Medico <zmedico@gentoo.org>2008-09-22 20:28:15 +0000
commit23a3278f3f0b861a81836a819fd9f55cbb37ed1e (patch)
tree75cd4df8d792c3f1cef2c2b1890e6f0748aa2aab
parent38321cf8c4a34703b2e5cb6ec2aa3251f4090ae2 (diff)
downloadportage-23a3278f3f0b861a81836a819fd9f55cbb37ed1e.tar.gz
portage-23a3278f3f0b861a81836a819fd9f55cbb37ed1e.tar.bz2
portage-23a3278f3f0b861a81836a819fd9f55cbb37ed1e.zip
Bug #230975 - Rename the portage.selinux module to portage._selinux in order
to avoid a relative import issue which caused portage.selinux to attempt to import itself instead of the real 'selinux' module. Thanks to Michael Edenfield for this patch. svn path=/main/trunk/; revision=11535
-rw-r--r--pym/portage/__init__.py2
-rw-r--r--pym/portage/_selinux.py (renamed from pym/portage/selinux.py)0
2 files changed, 1 insertions, 1 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 207432f35..79d99f813 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -140,7 +140,7 @@ except ImportError, e:
try:
- import portage.selinux as selinux
+ import portage._selinux as selinux
except OSError, e:
writemsg("!!! SELinux not loaded: %s\n" % str(e), noiselevel=-1)
del e
diff --git a/pym/portage/selinux.py b/pym/portage/_selinux.py
index e4d80fa1e..e4d80fa1e 100644
--- a/pym/portage/selinux.py
+++ b/pym/portage/_selinux.py