client/tools/rhncfg/config_common/file_utils.py | 2 +-
client/tools/rhncfg/rhncfg.spec | 5 ++++-
rel-eng/packages/rhncfg | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 09b2104210247ad1b845c708cbffea289caf5273
Author: Stephen Herr <sherr(a)redhat.com>
Date: Mon Jan 28 19:02:42 2013 -0500
Automatic commit of package [rhncfg] release [5.10.40-1].
diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index f49565c..e20fcb5 100644
--- a/client/tools/rhncfg/rhncfg.spec
+++ b/client/tools/rhncfg/rhncfg.spec
@@ -8,7 +8,7 @@ Group: Applications/System
License: GPLv2
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.10.39
+Version: 5.10.40
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -112,6 +112,9 @@ fi
# $Id$
%changelog
+* Mon Jan 28 2013 Stephen Herr <sherr(a)redhat.com> 5.10.40-1
+- 903534 - Web UI config diff always shows 'binary files differ'
+
* Fri Nov 30 2012 Jan Pazdziora 5.10.39-1
- 879299 - statinfo needs to be defined even if file does not exist
diff --git a/rel-eng/packages/rhncfg b/rel-eng/packages/rhncfg
index 1d273c0..3263ba1 100644
--- a/rel-eng/packages/rhncfg
+++ b/rel-eng/packages/rhncfg
@@ -1 +1 @@
-5.10.39-1 client/tools/rhncfg/
+5.10.40-1 client/tools/rhncfg/
commit 2fc32eb0081d67a803731a301d960faa396ebd84
Author: Neha Rawat <nerawat(a)redhat.com>
Date: Mon Jan 28 18:58:31 2013 -0500
903534 - Web UI config diff always shows 'binary files differ'
diff --git a/client/tools/rhncfg/config_common/file_utils.py
b/client/tools/rhncfg/config_common/file_utils.py
index 30dcce3..819c3e8 100644
--- a/client/tools/rhncfg/config_common/file_utils.py
+++ b/client/tools/rhncfg/config_common/file_utils.py
@@ -128,7 +128,7 @@ class FileProcessor:
else:
raise e
else:
- result = ''.join(diff(path, temp_file))
+ result = ''.join(diff(temp_file, path))
os.unlink(temp_file)
return sectx_result + result