From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 14 Aug 2009 23:54:45 +0000 (-0000)
Subject: Fix broken _selinux_merge definition.
X-Git-Tag: v2.2_rc39~64
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b5b22931b9097aedb7d46589d1ca923ffeeabb67;p=portage.git

Fix broken _selinux_merge definition.

svn path=/main/trunk/; revision=14057
---

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 9b7c6c01f..f8f0e222c 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -223,10 +223,11 @@ shutil = _unicode_module_wrapper(_shutil, encoding=_fs_encoding)
 # Imports below this point rely on the above unicode wrapper definitions.
 _selinux = None
 selinux = None
-_selinux_merge = _unicode_module_wrapper(_selinux, encoding=_merge_encoding)
+_selinux_merge = None
 try:
 	import portage._selinux
 	selinux = _unicode_module_wrapper(_selinux, encoding=_fs_encoding)
+	_selinux_merge = _unicode_module_wrapper(_selinux, encoding=_merge_encoding)
 except OSError, e:
 	sys.stderr.write("!!! SELinux not loaded: %s\n" % str(e))
 	del e