Hello community, here is the log from the commit of package crmsh for openSUSE:Factory checked in at 2017-03-02 19:38:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/crmsh (Old) and /work/SRC/openSUSE:Factory/.crmsh.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "crmsh" Thu Mar 2 19:38:13 2017 rev:116 rq:460814 version:3.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2017-02-20 13:13:52.710720042 +0100 +++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2017-03-02 19:38:14.475946197 +0100 @@ -2 +2 @@ -Tue Jan 31 15:50:51 UTC 2017 - kgronlund@suse.com +Tue Feb 28 07:30:42 UTC 2017 - kgronlund@suse.com @@ -4,3 +4,2 @@ -- Update to version 3.0.0: - * give the op's hint when type tab after 'op' - * medium: bootstrap: Configure hawk iff package installed +- Allow empty fencing topology (bsc#1025393) +- Add 0001-Allow-empty-fencing_topology-bsc-1025393.patch @@ -9,9 +8 @@ -Wed Jan 04 15:29:45 UTC 2017 - kgronlund@suse.com - -- Update to version 2.3.2+git.1483543612.cf853f8: - * medium: ui_cluster: Fix broken cluster remove command - * medium: bootstrap: Invoke _remote commands correctly - * low: ui_cluster: No need to check the cluster stack in requires - * low: bootstrap: Avoid warning if known_hosts doesn't exist - * low: bootstrap: Handle None as result from remote command correctly - * low: bootstrap: Don't check for ptty for _remote stages +Tue Jan 31 16:17:09 UTC 2017 - kgronlund@suse.com @@ -19,4 +10 @@ -------------------------------------------------------------------- -Fri Dec 16 08:05:28 UTC 2016 - kgronlund@suse.com - -- Update to version 2.3.2+git.1481875498.8cd1dd9: +- Update to version 3.0.0: @@ -24 +11,0 @@ - * high: scripts: Remove script versions of add/remove/init @@ -26 +12,0 @@ - * medium: ui_cluster: Compatibility mode for old cluster init behavior @@ -30,2 +16 @@ - * low: ui_script: Fix script list all/names argument handling - * low: ui: Fix vim highlightning support. + * medium: ui_cluster: Fix broken cluster remove command @@ -33,7 +17,0 @@ - * low: ui_cluster: start/stop don't touch corosync, just pacemaker - -------------------------------------------------------------------- -Tue Oct 25 11:46:42 UTC 2016 - kgronlund@suse.com - -- Update to version 2.3.1+git.1477204932.7939b51: - * medium: corosync: Fix missing variable in del-node @@ -42 +20,5 @@ - * doc: Fix inverted boolean in resource set documentation + * low: ui_cluster: start/stop don't touch corosync, just pacemaker + * low: ui_script: Fix script list all/names argument handling + * low: ui: Fix vim highlightning support. + * low: ui_cluster: No need to check the cluster stack in requires + * low: completers: give the op's hint when type tab after 'op' @@ -45 +27 @@ -Wed Oct 05 09:14:50 UTC 2016 - kgronlund@suse.com +Wed Nov 02 23:57:57 UTC 2016 - kgronlund@suse.com @@ -47 +29 @@ -- Update to version 2.3.1+git.1475245522.4172084: +- Update to version 2.2.0+git.1476084519.a000372: @@ -53,0 +36 @@ + * medium: corosync: Fix missing variable in del-node @@ -57 +40 @@ -Thu Sep 15 07:26:16 UTC 2016 - kgronlund@suse.com +Thu Sep 15 07:28:54 UTC 2016 - kgronlund@suse.com @@ -59 +42 @@ -- Update to version 2.3.1+git.1473924149.8abc212: +- Update to version 2.2.0+git.1473924149.8abc212: @@ -70,6 +52,0 @@ -Mon Aug 15 06:01:21 UTC 2016 - kgronlund@suse.com - -- Update to version 2.3.0+git.1470991992.7deaa3a: - * Release 2.3.0 - -------------------------------------------------------------------- @@ -177,13 +153,0 @@ -Thu Mar 31 06:00:48 UTC 2016 - kgronlund@suse.com - -- Update to version 2.2.0+git.1459359704.8d9b910: - + medium: scripts: Use os.uname() to find hostname (#128) - + low: logparser: Don't crash on nodes without logs - + low: history: Don't skip nodes without logs - + low: parser: ignore case for attr: prefix - + low: scripts: Need sudo if non-local call - + low: history: update the syslog format matching - + low: report: add information about booth - + low: report: if present, use the subsecond part from syslog timestamps - -------------------------------------------------------------------- @@ -240,0 +205,3 @@ + + high: scripts: Add LVM on DRBD cluster script (bsc#951132) + + high: scripts: Add NFS on LVM and DRBD cluster script (bsc#951132) + + high: added the "push" method to the "configure load" command (fate#320389) @@ -243,7 +210,2 @@ - + low: Fix title style vs. sentence style in cluster scripts (bsc#892108) - -------------------------------------------------------------------- -Thu Feb 04 07:00:04 UTC 2016 - kgronlund@suse.com - -- Update to version 2.2.0+git.1454489864.2aa76e4: - + medium: corosync: added optional parameter [name] to "corosync add-node" function + + medium: hb_report: Don't collect logs on non-nodes (bsc#959031) + + medium: ui_configure: Only wait for DC if resources were stopped (#117) @@ -251,8 +213 @@ - -------------------------------------------------------------------- -Wed Jan 27 11:36:03 UTC 2016 - kgronlund@suse.com - -- Update to version 2.2.0+git.1453820226.445f556: - + high: Add "push" method to "configure load" command (fate#320389) - + medium: history: update patterns for resource (new lrmd) - + medium: cibconfig: add and|or filter combinators to influence filtering (fate#320401) + + medium: corosync: added optional parameter [name] to "corosync add-node" function @@ -260 +215,7 @@ - + low: maintenance: allow action to be forced + + medium: cibconfig: add and|or filter combinators to influence filtering (fate#320401) + + Medium: history: update patterns for resource (new lrmd) + + medium: ui_configure: Rename show-property to get-property + + medium: scripts: Updated SBD cluster script (fate#318320) + + low: Fix title style vs. sentence style in cluster scripts (bsc#892108) + + low: Fix title style vs. sentence style in cluster scripts (bsc#892108) + + Low: maintenance: allow action to be forced @@ -262 +223,4 @@ -- Move dependencies of crmsh-test package to post +- Remove merged patches: + - Remove 0001-high-history-Parse-log-lines-without-timestamp-bsc-9.patch + - Remove 0002-high-scripts-Improved-OCFS2-cluster-script-bsc-95398.patch + - Remove 0003-high-scripts-fix-broken-cluster-init-script-bsc-9631.patch @@ -265 +229 @@ -Fri Jan 22 08:27:55 UTC 2016 - kgronlund@suse.com +Fri Jan 22 07:55:54 UTC 2016 - kgronlund@suse.com @@ -267,8 +231,6 @@ -- Update to version 2.2.0+git.1453451184.2fbd420: - + high: history: Parse log lines without timestamp (bsc#955581) - + high: scripts: Improved OCFS2 cluster script (bsc#953984) - + high: scripts: Add NFS on LVM and DRBD cluster script (bsc#951132) - + high: scripts: Add LVM on DRBD cluster script (bsc#951132) - + high: scripts: fix broken cluster init script (bsc#963135) - + medium: scripts: Updated SBD cluster script - + medium: ui_configure: Rename show-property to get-property +- high: scripts: fix broken cluster init script (bsc#963135) +- high: scripts: Improved OCFS2 cluster script (bsc#953984) +- high: history: Parse log lines without timestamp (bsc#955581) +- Add 0001-high-history-Parse-log-lines-without-timestamp-bsc-9.patch +- Add 0002-high-scripts-Improved-OCFS2-cluster-script-bsc-95398.patch +- Add 0003-high-scripts-fix-broken-cluster-init-script-bsc-9631.patch @@ -277 +239 @@ -Fri Jan 15 16:13:32 UTC 2016 - kgronlund@suse.com +Tue Jan 19 09:10:05 UTC 2016 - kgronlund@suse.com @@ -279,3 +241 @@ -- Update to version 2.2.0+git.1452874360.0988ac4: - + Release 2.2.0 - + low: don't use deprecated crm_attribute -U option +- Update to version 2.2.0~rc3+git.1452867205.c160c5a: @@ -283 +242,0 @@ - + medium: ui_cib: Call crm_shadow in batch mode to avoid spawning subshell (bsc#961392) @@ -286 +245 @@ - + low: hb_report: Drop function from event patterns + + medium: ui_cib: Call crm_shadow in batch mode to avoid spawning subshell (bsc#961392) @@ -290 +248,0 @@ - + low: clidisplay: Avoid crash when colorizing None @@ -293,0 +252,4 @@ + + low: don't use deprecated crm_attribute -U option + + low: hb_report: Drop function from event patterns + + low: clidisplay: Avoid crash when colorizing None + + doc: Documentation for history events command @@ -518 +480 @@ -- Update to version 2.2.0~rc3+git.1436439891.2cc4984: +- Update to version 2.2.0~rc3+git.1436439891.2cc4984 (fate#318281): @@ -638,56 +600 @@ -Fri May 29 09:09:03 UTC 2015 - kgronlund@suse.com - -- Remove unnecessary dependency on corosync for regression test suite - -------------------------------------------------------------------- -Mon May 25 13:22:36 UTC 2015 - kgronlund@suse.com - -- Update to version 2.2.0~rc2+git.1432560022.4e7baf3: - + dev: detect build revision if tarball contains .git - + medium: crm_pkg: Fix cluster init bug on RH-based systems - -------------------------------------------------------------------- -Fri May 22 08:08:23 UTC 2015 - kgronlund@suse.com - -- Update to version 2.2.0~rc2+git.1432219876.3d1027d: - + medium: crm_gv: Improved quoting of non-identifier node names (bsc#931837) - + low: Fix references to pssh to refer to parallax - + medium: crm_gv: Wrap non-identifier names in quotes (bsc#931837) - + doc: news: News update for 2.1.4 - + medium: parse: More robust implicit initial parser - + test: Rename test/unit-tests.sh to test/run - + medium: parse: Allow implicit initial for groups as well - + medium: ui_configure: Add resource as an alias for primitive - + high: report: New detection to fix missing transitions (bnc#917131) - + test: Fix python 2.6 compatibility issue - + low: xmlutil: Update comment to match the code - + medium: report: Try to load source as session if possible (bsc#927407) - -------------------------------------------------------------------- -Wed May 13 13:11:43 UTC 2015 - kgronlund@suse.com - -- Update to version 2.2.0~rc2+git.1431438882.ae4b493: - + doc: Update the documentation for the upgrade command ++++ 628 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/crmsh/crmsh.changes ++++ and /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes New: ---- 0001-Allow-empty-fencing_topology-bsc-1025393.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ crmsh.spec ++++++ --- /var/tmp/diff_new_pack.5Msa6s/_old 2017-03-02 19:38:15.107856777 +0100 +++ /var/tmp/diff_new_pack.5Msa6s/_new 2017-03-02 19:38:15.111856211 +0100 @@ -42,6 +42,8 @@ Release: 0 Url: http://crmsh.github.io Source0: %{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM: Allow empty fencing topology (bsc#1025393) +Patch1: 0001-Allow-empty-fencing_topology-bsc-1025393.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} # Requiring pacemaker makes crmsh harder to build on other distributions, @@ -143,6 +145,7 @@ %prep %setup -q +%patch1 -p1 # Force the local time # ++++++ 0001-Allow-empty-fencing_topology-bsc-1025393.patch ++++++

From 834ac8ca9fa6e7c2a991220366b269fc0063dc01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= <krig@koru.se> Date: Wed, 15 Feb 2017 13:46:53 +0100 Subject: [PATCH 1/2] Allow empty fencing_topology (bsc#1025393)

--- crmsh/parse.py | 10 ++++++---- test/unittests/test_parse.py | 4 ++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/crmsh/parse.py b/crmsh/parse.py index b06f78b0..93dad0a6 100644 --- a/crmsh/parse.py +++ b/crmsh/parse.py @@ -1070,7 +1070,7 @@ class FencingOrderParser(BaseParser): """ def parse(self, cmd): - self.begin(cmd, min_args=1) + self.begin(cmd) if not self.try_match("fencing-topology"): self.match("fencing_topology") target = "@@" @@ -1085,15 +1085,17 @@ class FencingOrderParser(BaseParser): target = self.matched(1) else: raw_levels.append((target, self.match_any())) - if len(raw_levels) == 0: - self.err("Missing list of devices") return self._postprocess_levels(raw_levels) def _postprocess_levels(self, raw_levels): from collections import defaultdict from itertools import repeat from .cibconfig import cib_factory - if raw_levels[0][0] == "@@": + if len(raw_levels) == 0: + def no_levels(): + return [] + lvl_generator = no_levels + elif raw_levels[0][0] == "@@": def node_levels(): for node in cib_factory.node_id_list(): for target, devices in raw_levels: diff --git a/test/unittests/test_parse.py b/test/unittests/test_parse.py index febdd383..6b32a08e 100644 --- a/test/unittests/test_parse.py +++ b/test/unittests/test_parse.py @@ -434,6 +434,10 @@ class TestCliParser(unittest.TestCase): def test_fencing(self): # num test nodes are 3 + out = self._parse('fencing_topology') + expect = '<fencing-topology/>' + self.assertEqual(expect, etree.tostring(out)) + out = self._parse('fencing_topology poison-pill power') expect = '<fencing-topology><fencing-level devices="poison-pill" index="1" target="ha-one"/><fencing-level devices="power" index="2" target="ha-one"/><fencing-level devices="poison-pill" index="1" target="ha-three"/><fencing-level devices="power" index="2" target="ha-three"/><fencing-level devices="poison-pill" index="1" target="ha-two"/><fencing-level devices="power" index="2" target="ha-two"/></fencing-topology>' self.assertEqual(expect, etree.tostring(out)) -- 2.11.1