Hello community, here is the log from the commit of package hawk2 for openSUSE:Leap:15.2 checked in at 2020-01-17 12:05:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/hawk2 (Old) and /work/SRC/openSUSE:Leap:15.2/.hawk2.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hawk2" Fri Jan 17 12:05:24 2020 rev:49 rq:764710 version:2.1.0+git.1526638315.05cdaf9d Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/hawk2/hawk2.changes 2020-01-15 15:10:35.502078667 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.hawk2.new.26092/hawk2.changes 2020-01-17 12:05:29.228610956 +0100 @@ -1,0 +2,7 @@ +Tue Dec 17 10:57:54 UTC 2019 - Ayoub Belarbi <[email protected]> + +- Added patches: + - Fix the acl_version method when parsing the cib.xml (bsc#1158681) + * 0003-Fix-cib.xml-parsing-for-acl_version-bsc-1158681.patch + +------------------------------------------------------------------- New: ---- 0003-Fix-cib.xml-parsing-for-acl_version-bsc-1158681.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hawk2.spec ++++++ --- /var/tmp/diff_new_pack.YzfghE/_old 2020-01-17 12:05:29.796611206 +0100 +++ /var/tmp/diff_new_pack.YzfghE/_new 2020-01-17 12:05:29.812611213 +0100 @@ -61,6 +61,8 @@ Patch1: 0001-Fix-nameless-cluster-display-bsc-1137891.patch # PATCH-FIX-UPSTREAM: Fix acl_version check (bsc#1089802) Patch2: 0002-Fix-acl_version-check-bsc-1089802.patch +# PATCH-FIX-UPSTREAM: Fix cib.xml parsing for acl_version method (bsc#1158681) +Patch3: 0003-Fix-cib.xml-parsing-for-acl_version-bsc-1158681.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: ha-cluster-webui Obsoletes: hawk <= 1.1.0 @@ -138,6 +140,7 @@ %patch -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build sed -i 's$#!/.*$#!%{_bindir}/ruby.%{rb_ruby_suffix}$' hawk/bin/rails ++++++ 0003-Fix-cib.xml-parsing-for-acl_version-bsc-1158681.patch ++++++ >From 057fac98cbad78306c7355636379f774749d8b71 Mon Sep 17 00:00:00 2001 From: Ayoub Belarbi <[email protected]> Date: Mon, 16 Dec 2019 15:20:55 +0100 Subject: [PATCH] Fix cib.xml parsing for acl_version (bsc#1158681) --- hawk/app/lib/util.rb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/hawk/app/lib/util.rb b/hawk/app/lib/util.rb index bbefd6d5..1539b71b 100644 --- a/hawk/app/lib/util.rb +++ b/hawk/app/lib/util.rb @@ -356,12 +356,7 @@ module Util def acl_version Rails.cache.fetch(:get_acl_version) do - m = safe_x( - '/usr/sbin/cibadmin', - '-t', '5', - '-Ql', - '--xpath', - '/cib[@validate-with]').lines.first.to_s.match(/validate-with=\"pacemaker-([0-9.]+)\"/) + m = `/usr/sbin/cibadmin -t 5 -Ql --xpath /cib[@validate-with]`.shellescape.lines.first.to_s.match(/validate-with=\"pacemaker-([0-9.]+)\"/) return m.captures[0].to_f if m 2.0 end -- 2.16.4
