backend/server/configFilesHandler.py | 2 +-
client/tools/rhncfg/config_management/rhncfg_add.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit e8c82ba2a052997a50dc19fea4bdfdba95349589
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jun 28 15:56:03 2012 +0200
765816 - value of selinux context is important
diff --git a/client/tools/rhncfg/config_management/rhncfg_add.py
b/client/tools/rhncfg/config_management/rhncfg_add.py
index 4f0aba7..82def77 100644
--- a/client/tools/rhncfg/config_management/rhncfg_add.py
+++ b/client/tools/rhncfg/config_management/rhncfg_add.py
@@ -49,7 +49,7 @@ class Handler(handler_base.HandlerBase):
help="Ignore missing local files",
),
handler_base.HandlerBase._option_class(
- '--selinux-context', action="store_true",
+ '--selinux-context', action="store",
help="Overwrite the SELinux context",
),
]
commit 2279b6d2fd6c824126e9bcaae4e3398a4565f50d
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jun 28 15:30:19 2012 +0200
765816 - file mode have to be string
fixing
Exception Handler Information
Traceback (most recent call last):
File "/usr/lib/python2.6/site-packages/spacewalk/server/apacheRequest.py",
line 122, in call_function
response = apply(func, params)
File
"/usr/share/rhn/server/handlers/config_mgmt/rhn_config_management.py", line 374,
in management_put_file
result = self.push_file(conf_channel_id, dict)
File
"/usr/lib/python2.6/site-packages/spacewalk/server/configFilesHandler.py", line
230, in push_file
result = self._push_file(config_channel_id, file)
File
"/usr/lib/python2.6/site-packages/spacewalk/server/configFilesHandler.py", line
214, in _push_file
self._push_config_file(file)
File
"/usr/lib/python2.6/site-packages/spacewalk/server/configFilesHandler.py", line
358, in _push_config_file
h.execute(**file)
File
"/usr/lib/python2.6/site-packages/spacewalk/server/rhnSQL/sql_base.py", line
163, in execute
return apply(self._execute_wrapper, (self._execute, ) + p, kw)
File
"/usr/lib/python2.6/site-packages/spacewalk/server/rhnSQL/driver_postgresql.py",
line 282, in _execute_wrapper
retval = apply(function, p, kw)
File
"/usr/lib/python2.6/site-packages/spacewalk/server/rhnSQL/sql_base.py", line
217, in _execute
return self._execute_(args, kwargs)
File
"/usr/lib/python2.6/site-packages/spacewalk/server/rhnSQL/driver_postgresql.py",
line 295, in _execute_
self._real_cursor.execute(self.sql, params)
SQLStatementPrepareError: ("function lookup_config_info(unknown, unknown,
integer, boolean, unknown) does not exist\\nLINE 2:
diff --git a/backend/server/configFilesHandler.py b/backend/server/configFilesHandler.py
index 29d5b24..ace83be 100644
--- a/backend/server/configFilesHandler.py
+++ b/backend/server/configFilesHandler.py
@@ -179,7 +179,7 @@ class ConfigFilesHandler(rhnHandler):
# Oracle doesn't like certain binding variables
file['username'] = file.get('user','')
file['groupname'] = file.get('group','')
- file['file_mode'] = file.get('mode','')
+ file['file_mode'] = str(file.get('mode',''))
# if the selinux flag is not sent by the client it is set to the last file
# revision (or to None (i.e. NULL) in case of first revision) - see the bug
# 644985 - SELinux context cleared from RHEL4 rhncfg-client