Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2018-02-09 15:48:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
 and      /work/SRC/openSUSE:Factory/.crmsh.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "crmsh"

Fri Feb  9 15:48:01 2018 rev:140 rq:574058 version:4.0.0+git.1518073467.76fb6a0b

Changes:
--------
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes      2018-02-07 
18:42:51.896104819 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2018-02-09 
15:48:02.158335569 +0100
@@ -1,0 +2,6 @@
+Thu Feb 08 07:05:28 UTC 2018 - kgronl...@suse.com
+
+- Update to version 4.0.0+git.1518073467.76fb6a0b:
+  * high: crm_script: Python2->3 string conversion crash in wizards 
(bsc#1074835)
+
+-------------------------------------------------------------------

Old:
----
  crmsh-4.0.0+git.1518010150.a58fa637.tar.bz2

New:
----
  crmsh-4.0.0+git.1518073467.76fb6a0b.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ crmsh.spec ++++++
--- /var/tmp/diff_new_pack.ODpf6s/_old  2018-02-09 15:48:02.970306410 +0100
+++ /var/tmp/diff_new_pack.ODpf6s/_new  2018-02-09 15:48:02.974306266 +0100
@@ -36,7 +36,7 @@
 Summary:        High Availability cluster command-line interface
 License:        GPL-2.0+
 Group:          %{pkg_group}
-Version:        4.0.0+git.1518010150.a58fa637
+Version:        4.0.0+git.1518073467.76fb6a0b
 Release:        0
 Url:            http://crmsh.github.io
 Source0:        %{name}-%{version}.tar.bz2

++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.ODpf6s/_old  2018-02-09 15:48:03.010304973 +0100
+++ /var/tmp/diff_new_pack.ODpf6s/_new  2018-02-09 15:48:03.010304973 +0100
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
             <param name="url">git://github.com/ClusterLabs/crmsh.git</param>
-          <param 
name="changesrevision">a58fa637efb583995c31c62d3fa3894b875e2f3a</param></service></servicedata>
\ No newline at end of file
+          <param 
name="changesrevision">76fb6a0be7c121e971907d98af7e4b3bbc6f9548</param></service></servicedata>
\ No newline at end of file

++++++ crmsh-4.0.0+git.1518010150.a58fa637.tar.bz2 -> 
crmsh-4.0.0+git.1518073467.76fb6a0b.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/crmsh-4.0.0+git.1518010150.a58fa637/utils/crm_script.py 
new/crmsh-4.0.0+git.1518073467.76fb6a0b/utils/crm_script.py
--- old/crmsh-4.0.0+git.1518010150.a58fa637/utils/crm_script.py 2018-02-07 
14:29:10.000000000 +0100
+++ new/crmsh-4.0.0+git.1518073467.76fb6a0b/utils/crm_script.py 2018-02-08 
08:04:27.000000000 +0100
@@ -22,6 +22,16 @@
         break
 
 
+def decode_utf8(s):
+    """
+    Convert the given byte sequence to a
+    utf8 string.
+    """
+    if s is None or isinstance(s, str):
+        return s
+    return s.decode('utf-8', 'ignore')
+
+
 def host():
     return os.uname()[1]
 
@@ -96,7 +106,7 @@
     debug("crm_script(call): %s" % (cmd))
     p = proc.Popen(cmd, shell=shell, stdin=None, stdout=proc.PIPE, 
stderr=proc.PIPE)
     out, err = p.communicate()
-    return p.returncode, out.decode('utf-8').strip(), 
err.decode('utf-8').strip()
+    return p.returncode, decode_utf8(out).strip(), decode_utf8(err).strip()
 
 
 def use_sudo():
@@ -131,7 +141,7 @@
     rc, out, err = sudo_call(['./crm_pkg.py', '-n', name, '-s', state])
     if rc != 0:
         raise IOError("%s / %s" % (out, err))
-    outp = json.loads(out.decode('utf-8'))
+    outp = json.loads(decode_utf8(out))
     if isinstance(outp, dict) and 'rc' in outp:
         rc = int(outp['rc'])
         if rc != 0:


Reply via email to