Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2022-07-09 17:03:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.1523 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "crmsh"
Sat Jul 9 17:03:18 2022 rev:248 rq:987936 version:4.4.0+20220708.6ed6b56f
Changes:
--------
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2022-07-08
14:02:58.738520674 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.1523/crmsh.changes 2022-07-09
17:05:34.728930322 +0200
@@ -1,0 +2,6 @@
+Fri Jul 08 06:15:31 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.0+20220708.6ed6b56f:
+ * Fix: utils: use -o and -n to compare files instead of strings for crm_diff
(bsc#1201312)
+
+-------------------------------------------------------------------
Old:
----
crmsh-4.4.0+20220705.bb8708eb.tar.bz2
New:
----
crmsh-4.4.0+20220708.6ed6b56f.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ crmsh.spec ++++++
--- /var/tmp/diff_new_pack.S5POGu/_old 2022-07-09 17:05:35.212930781 +0200
+++ /var/tmp/diff_new_pack.S5POGu/_new 2022-07-09 17:05:35.216930785 +0200
@@ -36,7 +36,7 @@
Summary: High Availability cluster command-line interface
License: GPL-2.0-or-later
Group: %{pkg_group}
-Version: 4.4.0+20220705.bb8708eb
+Version: 4.4.0+20220708.6ed6b56f
Release: 0
URL: http://crmsh.github.io
Source0: %{name}-%{version}.tar.bz2
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.S5POGu/_old 2022-07-09 17:05:35.272930838 +0200
+++ /var/tmp/diff_new_pack.S5POGu/_new 2022-07-09 17:05:35.276930841 +0200
@@ -9,7 +9,7 @@
</service>
<service name="tar_scm">
<param name="url">https://github.com/ClusterLabs/crmsh.git</param>
- <param
name="changesrevision">bb8708ebfe5eb3710295e26594f81642107779b6</param>
+ <param
name="changesrevision">6ed6b56f3466172c3375dd28ff68492d18bebcb8</param>
</service>
</servicedata>
(No newline at EOF)
++++++ crmsh-4.4.0+20220705.bb8708eb.tar.bz2 ->
crmsh-4.4.0+20220708.6ed6b56f.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.0+20220705.bb8708eb/crmsh/utils.py
new/crmsh-4.4.0+20220708.6ed6b56f/crmsh/utils.py
--- old/crmsh-4.4.0+20220705.bb8708eb/crmsh/utils.py 2022-07-05
03:37:20.000000000 +0200
+++ new/crmsh-4.4.0+20220708.6ed6b56f/crmsh/utils.py 2022-07-08
07:57:36.000000000 +0200
@@ -3077,7 +3077,13 @@
"""
# In cibconfig.py, _patch_cib method doesn't include status section
# So here should make a function to handle common cases
- cmd = "crm_diff -u -O '{}' -N '{}'".format(orig_cib_str, current_cib_str)
+ from . import tmpfiles
+ orig_cib_file = str2tmp(orig_cib_str, suffix=".xml")
+ current_cib_file = str2tmp(current_cib_str, suffix=".xml")
+ tmpfiles.add(orig_cib_file)
+ tmpfiles.add(current_cib_file)
+
+ cmd = "crm_diff -u -o '{}' -n '{}'".format(orig_cib_file, current_cib_file)
rc, cib_diff, err = get_stdout_stderr(cmd)
if rc == 0: # no difference
return True
