client/tools/rhncfg/config_common/file_utils.py | 9 +++++++--
client/tools/rhncfg/config_common/repository.py | 2 ++
2 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 97fead2f7823a92e091ca607ab27bbf5a0041fcd
Author: Marcelo Moreira de Mello <mmello(a)redhat.com>
Date: Thu Mar 17 12:11:38 2011 -0300
688461 - fixed python exception when comparing files using web UI and SELinux disabled
in RHEL6
diff --git a/client/tools/rhncfg/config_common/file_utils.py
b/client/tools/rhncfg/config_common/file_utils.py
index c506337..7d34884 100644
--- a/client/tools/rhncfg/config_common/file_utils.py
+++ b/client/tools/rhncfg/config_common/file_utils.py
@@ -19,7 +19,7 @@ import tempfile
import base64
import difflib
try:
- from selinux import lgetfilecon
+ from selinux import lgetfilecon, is_selinux_enabled
except:
# on rhel4 we do not support selinux
def lgetfilecon(path):
@@ -97,9 +97,14 @@ class FileProcessor:
sectx_result = ''
result = ''
- cur_sectx = lgetfilecon(path)[1]
+ if is_selinux_enabled():
+ cur_sectx = lgetfilecon(path)[1]
+ else:
+ cur_sectx = None
+
if cur_sectx == None:
cur_sectx = ''
+
if file_struct.has_key('selinux_ctx') and
file_struct['selinux_ctx']:
if cur_sectx != file_struct['selinux_ctx']:
sectx_result = "SELinux contexts differ: actual: [%s], expected:
[%s]\n" % (cur_sectx, file_struct['selinux_ctx'])
diff --git a/client/tools/rhncfg/config_common/repository.py
b/client/tools/rhncfg/config_common/repository.py
index 65eda11..3a50da4 100644
--- a/client/tools/rhncfg/config_common/repository.py
+++ b/client/tools/rhncfg/config_common/repository.py
@@ -144,6 +144,8 @@ class Repository:
if is_selinux_enabled():
ret['selinux_ctx'] = selinux_ctx
+ else:
+ ret['selinux_ctx'] = ''
return ret
Show replies by date