Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2019-08-22 10:52:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
 and      /work/SRC/openSUSE:Factory/.crmsh.new.22127 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "crmsh"

Thu Aug 22 10:52:51 2019 rev:161 rq:724856 version:4.1.0+git.1566218232.dbdf060c

Changes:
--------
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes      2019-07-29 
17:27:29.426277800 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.22127/crmsh.changes   2019-08-22 
10:52:54.365695588 +0200
@@ -1,0 +2,7 @@
+Mon Aug 19 12:43:55 UTC 2019 - dake...@suse.com
+
+- Update to version 4.1.0+git.1566218232.dbdf060c:
+  * Fix: utils: fix logic for process non comments line(bsc#1145823)
+  * Low: unittest: add unittest for bsc#1145823
+
+-------------------------------------------------------------------

Old:
----
  crmsh-4.1.0+git.1563261260.3b251242.tar.bz2

New:
----
  crmsh-4.1.0+git.1566218232.dbdf060c.tar.bz2

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

Other differences:
------------------
++++++ crmsh.spec ++++++
--- /var/tmp/diff_new_pack.riF02a/_old  2019-08-22 10:52:54.937695511 +0200
+++ /var/tmp/diff_new_pack.riF02a/_new  2019-08-22 10:52:54.937695511 +0200
@@ -36,7 +36,7 @@
 Summary:        High Availability cluster command-line interface
 License:        GPL-2.0-or-later
 Group:          %{pkg_group}
-Version:        4.1.0+git.1563261260.3b251242
+Version:        4.1.0+git.1566218232.dbdf060c
 Release:        0
 Url:            http://crmsh.github.io
 Source0:        %{name}-%{version}.tar.bz2

++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.riF02a/_old  2019-08-22 10:52:54.985695505 +0200
+++ /var/tmp/diff_new_pack.riF02a/_new  2019-08-22 10:52:54.985695505 +0200
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
             <param name="url">git://github.com/ClusterLabs/crmsh.git</param>
-          <param 
name="changesrevision">d6fd16b91113c57af0e96b1d6aca0630ffdccaa1</param></service></servicedata>
\ No newline at end of file
+          <param 
name="changesrevision">dbdf060c6e4809cf562ff7beafbd5afff8de6ebf</param></service></servicedata>
\ No newline at end of file

++++++ crmsh-4.1.0+git.1563261260.3b251242.tar.bz2 -> 
crmsh-4.1.0+git.1566218232.dbdf060c.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/crmsh-4.1.0+git.1563261260.3b251242/crmsh/utils.py 
new/crmsh-4.1.0+git.1566218232.dbdf060c/crmsh/utils.py
--- old/crmsh-4.1.0+git.1563261260.3b251242/crmsh/utils.py      2019-07-16 
09:14:20.000000000 +0200
+++ new/crmsh-4.1.0+git.1566218232.dbdf060c/crmsh/utils.py      2019-08-19 
14:37:12.000000000 +0200
@@ -1904,18 +1904,18 @@
                 outp += line
             else:
                 matched = False
-            try:
-                key, _ = line.split("=", 1)
-                for k, v in values.items():
-                    if k == key:
-                        matched = True
-                        outp += '%s=%s\n' % (k, doublequote(v))
-                        del values[k]
-                        break
-                if not matched:
+                try:
+                    key, _ = line.split("=", 1)
+                    for k, v in values.items():
+                        if k == key:
+                            matched = True
+                            outp += '%s=%s\n' % (k, doublequote(v))
+                            del values[k]
+                            break
+                    if not matched:
+                        outp += line
+                except ValueError:
                     outp += line
-            except ValueError:
-                outp += line
 
     for k, v in values.items():
         outp += '%s=%s\n' % (k, doublequote(v))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/crmsh-4.1.0+git.1563261260.3b251242/test/unittests/test_utils.py 
new/crmsh-4.1.0+git.1566218232.dbdf060c/test/unittests/test_utils.py
--- old/crmsh-4.1.0+git.1563261260.3b251242/test/unittests/test_utils.py        
2019-07-16 09:14:20.000000000 +0200
+++ new/crmsh-4.1.0+git.1566218232.dbdf060c/test/unittests/test_utils.py        
2019-08-19 14:37:12.000000000 +0200
@@ -177,3 +177,14 @@
     sc = utils.parse_sysconfig(fname)
     assert (sc.get("FW_SERVICES_ACCEPT_EXT") == "foo=bar")
     assert (sc.get("FOO") == "bar")
+
+def test_sysconfig_set_bsc1145823():
+    s = '''# this is test
+#age=1000
+'''
+    fd, fname = tmpfiles.create()
+    with open(fname, 'w') as f:
+        f.write(s)
+    utils.sysconfig_set(fname, age="100")
+    sc = utils.parse_sysconfig(fname)
+    assert (sc.get("age") == "100")


Reply via email to