From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 22 Sep 2008 20:28:15 +0000 (-0000)
Subject: Bug #230975 - Rename the portage.selinux module to portage._selinux in order
X-Git-Tag: v2.2_rc10~21
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=23a3278f3f0b861a81836a819fd9f55cbb37ed1e;p=portage.git

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
---

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
similarity index 100%
rename from pym/portage/selinux.py
rename to pym/portage/_selinux.py