Hello community, here is the log from the commit of package yast2-cluster for openSUSE:Factory checked in at 2018-03-02 21:12:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-cluster (Old) and /work/SRC/openSUSE:Factory/.yast2-cluster.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-cluster" Fri Mar 2 21:12:46 2018 rev:24 rq:581931 version:4.0.5 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-cluster/yast2-cluster.changes 2018-01-29 15:00:46.953201366 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-cluster.new/yast2-cluster.changes 2018-03-02 21:12:49.806520050 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 08:01:20 UTC 2018 - [email protected] + +- bsc#1083439, fix traceback when starting without corosync.conf +- Version 4.0.5 + +------------------------------------------------------------------- Old: ---- yast2-cluster-4.0.4.tar.bz2 New: ---- yast2-cluster-4.0.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-cluster.spec ++++++ --- /var/tmp/diff_new_pack.VfKD1a/_old 2018-03-02 21:12:51.590455899 +0100 +++ /var/tmp/diff_new_pack.VfKD1a/_new 2018-03-02 21:12:51.594455756 +0100 @@ -18,7 +18,7 @@ Name: yast2-cluster %define _fwdefdir %{_libexecdir}/firewalld/services -Version: 4.0.4 +Version: 4.0.5 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-cluster-4.0.4.tar.bz2 -> yast2-cluster-4.0.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-cluster-4.0.4/package/yast2-cluster.changes new/yast2-cluster-4.0.5/package/yast2-cluster.changes --- old/yast2-cluster-4.0.4/package/yast2-cluster.changes 2018-01-29 09:19:20.000000000 +0100 +++ new/yast2-cluster-4.0.5/package/yast2-cluster.changes 2018-03-02 10:07:06.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Mar 2 08:01:20 UTC 2018 - [email protected] + +- bsc#1083439, fix traceback when starting without corosync.conf +- Version 4.0.5 + +------------------------------------------------------------------- Tue Jan 23 09:04:02 UTC 2018 - [email protected] - SuSEFirewall2 replaced by firewalld(fate#323460) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-cluster-4.0.4/package/yast2-cluster.spec new/yast2-cluster-4.0.5/package/yast2-cluster.spec --- old/yast2-cluster-4.0.4/package/yast2-cluster.spec 2018-01-29 09:19:20.000000000 +0100 +++ new/yast2-cluster-4.0.5/package/yast2-cluster.spec 2018-03-02 10:07:06.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-cluster # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ Name: yast2-cluster %define _fwdefdir %{_libexecdir}/firewalld/services -Version: 4.0.4 +Version: 4.0.5 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-cluster-4.0.4/src/servers_non_y2/ag_openais new/yast2-cluster-4.0.5/src/servers_non_y2/ag_openais --- old/yast2-cluster-4.0.4/src/servers_non_y2/ag_openais 2018-01-29 09:19:20.000000000 +0100 +++ new/yast2-cluster-4.0.5/src/servers_non_y2/ag_openais 2018-03-02 10:07:06.000000000 +0100 @@ -188,11 +188,12 @@ } # Using [] instead of {} is because some sections like nodelist have many nodes -totem_options = {} -logging_options = {} +# Default value to avoid traceback in doRead when without corosync.conf +totem_options = {"interface":[]} +logging_options = {"logger_subsys":[]} quorum_qdevice_options={} -quorum_options={} -nodelist_options={} +quorum_options={"device":quorum_qdevice_options} +nodelist_options={"node":[]} qb_options={} def strip_comments_and_pending_space(line): @@ -716,7 +717,6 @@ pass def doWrite(self, path, args): - global quorum_options global quorum_qdevice_options if path[0] == "": @@ -727,8 +727,11 @@ quorum_options[path[1]] = args return "true" elif len(path) == 2 and path[1] == "device" and args == "": - del(quorum_options["device"]) - quorum_qdevice_options = {} + # May no "device" in quorum_options, + # cause reset in file_parser + if is_quorum_qdevice_configured(): + del(quorum_options["device"]) + quorum_qdevice_options = {} return "true" elif len(path) == 3 and path[1] == "device" and \ path[2] in quorum_qdevice_option_table.keys():
