Merge ~athos-ribeiro/ubuntu/+source/crmsh:lp1972730-jammy-sru into ubuntu/+source/crmsh:ubuntu/jammy-devel

[Athos Ribeiro]

SRU proposed in LP: #1972730 by Felipe Reyes.

PPA: https://launchpad.net/~athos-ribeiro/+archive/ubuntu/lp1972730-crmsh/+packages

DEP8 test suite local run result summary:

autopkgtest [11:36:19]: @@@@@@@@@@@@@@@@@@@@ summary
command1 PASS
command2 PASS
command3 PASS
utils.sh PASS
testsuite.sh PASS
pacemaker-basic-resource.sh PASS
pacemaker-node-status.sh PASS

[Athos Ribeiro (athos-ribeiro)]

As discussed offline, this should not require an additional +1 since it is part of sponsoring a non-server contribution.

Uploaded:

$ dput ubuntu ../crmsh_4.3.1-1ubuntu3_source.changes
D: Setting host argument.
Checking signature on .changes
gpg: ../crmsh_4.3.1-1ubuntu3_source.changes: Valid signature from 033C4CA276024834
Checking signature on .dsc
gpg: ../crmsh_4.3.1-1ubuntu3.dsc: Valid signature from 033C4CA276024834
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading crmsh_4.3.1-1ubuntu3.dsc: done.
  Uploading crmsh_4.3.1-1ubuntu3.debian.tar.xz: done.
  Uploading crmsh_4.3.1-1ubuntu3_source.buildinfo: done.
  Uploading crmsh_4.3.1-1ubuntu3_source.changes: done.
Successfully uploaded packages.

[Athos Ribeiro (athos-ribeiro)]

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 63a8118..88bd1bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+crmsh (4.3.1-1ubuntu3) jammy; urgency=medium
+
+  * d/p/lp1972730.patch: Handle the output of 'crmadmin -S' correctly
+    (LP: #1972730).
+
+ -- Felipe Reyes <[e-mail]>  Fri, 01 Jul 2022 10:59:50 -0400
+
 crmsh (4.3.1-1ubuntu2) jammy; urgency=medium
 
   * d/t/control: add resource-agents-extra as a dependency of
diff --git a/debian/patches/lp1972730.patch b/debian/patches/lp1972730.patch
new file mode 100644
index 0000000..43e596b
--- /dev/null
+++ b/debian/patches/lp1972730.patch
@@ -0,0 +1,37 @@
+From 945654d00c8376d1ad8fbd4f6e82ee140b00409e Mon Sep 17 00:00:00 2001
+From: liangxin1300 <[e-mail]>
+Date: Wed, 11 May 2022 11:09:28 +0800
+Subject: [PATCH] Fix: utils: wait4dc: Make change since output of 'crmadmin
+ -S' changed(bsc#1199412)
+
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/crmsh/+bug/1972730
+Origin: upstream, https://github.com/ClusterLabs/crmsh/commit/945654d00c8376d1ad8fbd4f6e82ee140b00409e
+Last-Update: 2022-07-04
+---
+ crmsh/utils.py | 12 +++---------
+ 1 file changed, 3 insertions(+), 9 deletions(-)
+
+Index: crmsh-4.3.1/crmsh/utils.py
+===================================================================
+--- crmsh-4.3.1.orig/crmsh/utils.py
++++ crmsh-4.3.1/crmsh/utils.py
+@@ -888,16 +888,10 @@ def wait4dc(what="", show_progress=True)
+             return False
+         cmd = "crmadmin -S %s" % dc
+         rc, s = get_stdout(add_sudo(cmd))
+-        if not s.startswith("Status"):
+-            common_warn("%s unexpected output: %s (exit code: %d)" %
+-                        (cmd, s, rc))
++        if rc != 0:
++            common_err("Exit code of command {} is {}".format(cmd, rc))
+             return False
+-        try:
+-            dc_status = s.split()[-2]
+-        except:
+-            common_warn("%s unexpected output: %s" % (cmd, s))
+-            return False
+-        if dc_status == "S_IDLE":
++        if re.search("S_IDLE.*ok", s):
+             if output_started:
+                 sys.stderr.write(" done\n")
+             return True
diff --git a/debian/patches/series b/debian/patches/series
index f07fd29..8948f14 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@
 0019-Add-hb_report-dpkg-support.patch
 0020-Use-crmsh-hb_report.patch
 0021-Support-python-310.patch
+lp1972730.patch