You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
38 lines
1.3 KiB
38 lines
1.3 KiB
6 years ago
|
diff --git a/config_common/file_utils.py b/config_common/file_utils.py
|
||
|
|
index 4b18fe3..f334bd5 100644
|
||
|
|
--- a/config_common/file_utils.py
|
||
|
|
+++ b/config_common/file_utils.py
|
||
|
|
@@ -252,7 +252,7 @@ def diff(src, dst, srcname=None, dstname=None, display_diff=False, is_binary=Fal
|
||
|
|
f_time = time.ctime(0)
|
||
|
|
if not name:
|
||
|
|
name = path
|
||
|
|
- return (str(content), name, f_time, statinfo)
|
||
|
|
+ return (content, name, f_time, statinfo)
|
||
|
|
|
||
|
|
(src_content, src_name, src_time, src_stat) = f_content(src, srcname, is_binary)
|
||
|
|
(dst_content, dst_name, dst_time, dst_stat) = f_content(dst, dstname, is_binary)
|
||
|
|
diff --git a/rhncfg.spec b/rhncfg.spec
|
||
|
|
index 54b6050..f5e1833 100644
|
||
|
|
--- a/rhncfg.spec
|
||
|
|
+++ b/rhncfg.spec
|
||
|
|
@@ -15,7 +15,7 @@
|
||
|
|
|
||
|
|
Name: rhncfg
|
||
|
|
Version: 5.10.120
|
||
|
|
-Release: 7%{?dist}
|
||
|
|
+Release: 8%{?dist}
|
||
|
|
Summary: Spacewalk Configuration Client Libraries
|
||
|
|
License: GPLv2
|
||
|
|
URL: https://github.com/spacewalkproject/spacewalk
|
||
|
|
@@ -281,6 +281,10 @@ fi
|
||
|
|
%endif
|
||
|
|
|
||
|
|
%changelog
|
||
|
|
+* Tue Nov 06 2018 Tomas Kasparek <tkasparek@redhat.com> 5.10.120-8
|
||
|
|
+- Resolves: rhbz#1645005 - unified_diff takes list, not string as a paremeter
|
||
|
|
+ (tkasparek@redhat.com)
|
||
|
|
+
|
||
|
|
* Tue Jul 24 2018 Tomas Kasparek <tkasparek@redhat.com> 5.10.120-7
|
||
|
|
- Resolves: #1601754 - require python3 version of dependencies on systems with
|
||
|
|
default py3 (tkasparek@redhat.com)
|