diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-08-14 23:54:45 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-08-14 23:54:45 +0000 |
| commit | b5b22931b9097aedb7d46589d1ca923ffeeabb67 (patch) | |
| tree | 5b9c45a84d585b075b0a6ccefa25863e92244b18 | |
| parent | 945464ab91f07aa8af47884e2246ccb638a8144f (diff) | |
| download | portage-b5b22931b9097aedb7d46589d1ca923ffeeabb67.tar.gz portage-b5b22931b9097aedb7d46589d1ca923ffeeabb67.tar.bz2 portage-b5b22931b9097aedb7d46589d1ca923ffeeabb67.zip | |
Fix broken _selinux_merge definition.
svn path=/main/trunk/; revision=14057
| -rw-r--r-- | pym/portage/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
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 |