client/tools/rhncfg/config_client/rhncfgcli_verify.py | 5 ++++-
client/tools/rhncfg/rhncfg.spec | 5 ++++-
rel-eng/packages/rhncfg | 2 +-
3 files changed, 9 insertions(+), 3 deletions(-)
New commits:
commit 1fd2b3ee1924be613ad240fb08a08d3ff6f4d259
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 30 13:46:49 2011 +0100
Automatic commit of package [rhncfg] release [5.10.21-1].
diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index 605f809..206641b 100644
--- a/client/tools/rhncfg/rhncfg.spec
+++ b/client/tools/rhncfg/rhncfg.spec
@@ -8,7 +8,7 @@ Group: Applications/System
License: GPLv2 and Python
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.10.20
+Version: 5.10.21
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -106,6 +106,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Wed Nov 30 2011 Miroslav Suchý 5.10.21-1
+- handle fs objects without selinux context correctly
+
* Mon Nov 21 2011 Michael Mraka <michael.mraka(a)redhat.com> 5.10.20-1
- 627490 - fixed cross device symlink backup
diff --git a/rel-eng/packages/rhncfg b/rel-eng/packages/rhncfg
index 69ba182..6ada7b2 100644
--- a/rel-eng/packages/rhncfg
+++ b/rel-eng/packages/rhncfg
@@ -1 +1 @@
-5.10.20-1 client/tools/rhncfg/
+5.10.21-1 client/tools/rhncfg/
commit 30bbbe8a30fe088c42f4d515ad3aad85ba9773a0
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 30 13:44:00 2011 +0100
handle fs objects without selinux context correctly
Traceback (most recent call last):
File "/usr/bin/rhncfg-client", line 34, in <module>
sys.exit(Main().main() or 0)
File "/usr/share/rhn/config_common/rhn_main.py", line 187, in main
handler.run()
File "/usr/share/rhn/config_client/rhncfgcli_verify.py", line 83, in run
ret_dict = self._process_file(src, dst, file, ftype, file_info)
File "/usr/share/rhn/config_client/rhncfgcli_verify.py", line 250, in
_process_file
dst_selinux = lgetfilecon(dst)[1]
OSError: [Errno 61] No data available
diff --git a/client/tools/rhncfg/config_client/rhncfgcli_verify.py
b/client/tools/rhncfg/config_client/rhncfgcli_verify.py
index a87dc47..22d6195 100644
--- a/client/tools/rhncfg/config_client/rhncfgcli_verify.py
+++ b/client/tools/rhncfg/config_client/rhncfgcli_verify.py
@@ -247,7 +247,10 @@ class Handler(handler_base.HandlerBase):
src_selinux = info['selinux_ctx']
if src_selinux:
if not stat_err:
- dst_selinux = lgetfilecon(dst)[1]
+ try:
+ dst_selinux = lgetfilecon(dst)[1]
+ except OSError:
+ dst_selinux = ""
if dst_selinux == None:
dst_selinux = ""
else: