From 80d82135c2636ea5dfec66a8f6c95d7dfee5b137 Mon Sep 17 00:00:00 2001 From: bizhiyuan Date: Mon, 4 Sep 2023 09:30:22 +0800 Subject: [PATCH] Fix a bug in clone resource description display (cherry picked from commit 16010a26d32752aa9802fcdf2120a372c8f1fb0d) --- ...n-clone-resource-description-display.patch | 26 +++++++++++++++++++ pacemaker.spec | 6 ++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 Fix-a-bug-in-clone-resource-description-display.patch diff --git a/Fix-a-bug-in-clone-resource-description-display.patch b/Fix-a-bug-in-clone-resource-description-display.patch new file mode 100644 index 0000000..711bb18 --- /dev/null +++ b/Fix-a-bug-in-clone-resource-description-display.patch @@ -0,0 +1,26 @@ +From ca62cd81870590977f77e95636754214d842814c Mon Sep 17 00:00:00 2001 +From: bizhiyuan +Date: Mon, 4 Sep 2023 10:00:40 +0800 +Subject: [PATCH] Fix a bug in clone resource description display + +--- + lib/pengine/pe_output.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/lib/pengine/pe_output.c b/lib/pengine/pe_output.c +index 68cc867..d9e2620 100644 +--- a/lib/pengine/pe_output.c ++++ b/lib/pengine/pe_output.c +@@ -20,8 +20,7 @@ pe__resource_description(const pe_resource_t *rsc, uint32_t show_opts) + { + const char * desc = NULL; + // User-supplied description +- if (pcmk_any_flags_set(show_opts, pcmk_show_rsc_only|pcmk_show_description) +- || pcmk__list_of_multiple(rsc->running_on)) { ++ if (pcmk_any_flags_set(show_opts, pcmk_show_rsc_only|pcmk_show_description)){ + desc = crm_element_value(rsc->xml, XML_ATTR_DESC); + } + return desc; +-- +2.27.0 + diff --git a/pacemaker.spec b/pacemaker.spec index 40438be..3613adc 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -17,7 +17,7 @@ ## can be incremented to build packages reliably considered "newer" ## than previously built packages with the same pcmkversion) %global pcmkversion 2.1.6 -%global specversion 7 +%global specversion 8 ## Upstream commit (full commit ID, abbreviated commit ID, or tag) to build %global commit 6fdc9deea294bbad629b003c6ae036aaed8e3ee0 @@ -157,6 +157,7 @@ Patch2: 0001-Add-the-parameter-of-dampening-and-fix-attrd_updater-HealthI Patch3: Fix-libcrmcommon-wait-for-reply-from-appropriate-con.patch Patch4: Refactor-fencer-sleep-1s-between-reconnects.patch Patch5: Fix-the-validation-function-of-input.patch +Patch6: Fix-a-bug-in-clone-resource-description-display.patch # upstream commits Requires: resource-agents @@ -776,6 +777,9 @@ exit 0 %license %{nagios_name}-%{nagios_hash}/COPYING %changelog +* Mon Sep 4 2023 bizhiyuan - 2.1.6-8 +- Fix a bug in clone resource description display + * Thu Aug 31 2023 liupei -2.1.6-7 - Fix the validation function of input for HealthCPU -- Gitee