Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-15-SP7:Update
pacemaker.26413
pacemaker-XML-upgrade-2.10.xsl-remaining-markin...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File pacemaker-XML-upgrade-2.10.xsl-remaining-marking-space-with-op-meta_attributes.patch of Package pacemaker.26413
commit f912b40b7bea3483929262dc844e2d2d52cfa9b9 Author: Jan Pokorný <jpokorny@redhat.com> Date: Thu May 10 23:46:36 2018 +0200 XML: upgrade-2.10.xsl: remaining "marking" space with op meta_attributes It turned out that batch of ee8017bdd^...13a370436 commits on the topic still missed this one. diff --git a/xml/test-2/021-rsc-requires-nvpair.ref b/xml/test-2/021-rsc-requires-nvpair.ref index 8545bd1e8..0dd6efb08 100644 --- a/xml/test-2/021-rsc-requires-nvpair.ref +++ b/xml/test-2/021-rsc-requires-nvpair.ref @@ -22,7 +22,7 @@ <!-- relying on order (+ colocation) to guarantee "requires" transitively (unfencing/fencing/quorum)? --> - <nvpair id="myAddr-start-requires" name="requires" value="nothing"/> + <nvpair id="myAddr-start-requires" name="requires" value="nothing"/> </meta_attributes></primitive> <primitive id="myHttpd" class="ocf" provider="heartbeat" type="apache"> diff --git a/xml/test-2/024-rsc-requires-no-selfclash.ref b/xml/test-2/024-rsc-requires-no-selfclash.ref index 5aabac39b..ee56fb24b 100644 --- a/xml/test-2/024-rsc-requires-no-selfclash.ref +++ b/xml/test-2/024-rsc-requires-no-selfclash.ref @@ -100,7 +100,7 @@ </operations> <meta_attributes id="_2TO3_stateful2-promote-meta3"> - <nvpair id="stateful2-promote-requires3-1" name="requires" value="fencing"/> + <nvpair id="stateful2-promote-requires3-1" name="requires" value="fencing"/> </meta_attributes></primitive> </clone> diff --git a/xml/test-2/024-rsc-requires-no-selfclash.ref.err b/xml/test-2/024-rsc-requires-no-selfclash.ref.err index f1025f81e..e6d575501 100644 --- a/xml/test-2/024-rsc-requires-no-selfclash.ref.err +++ b/xml/test-2/024-rsc-requires-no-selfclash.ref.err @@ -1,9 +1,9 @@ -Resources-operation: moving requires under meta_attributes as requires unless already defined there for matching start|promote Resources-operation: myAddr1-start: moving requires under meta_attributes as requires unless already defined there for matching start|promote Resources-operation: moving requires under meta_attributes as requires unless already defined there for matching start|promote Resources-operation: myAddr2-start: moving requires under meta_attributes as requires unless already defined there for matching start|promote Resources-operation: moving requires under meta_attributes as requires unless already defined there for matching start|promote Resources-operation: moving requires under meta_attributes as requires unless already defined there for matching start|promote +Resources-operation: moving requires under meta_attributes as requires unless already defined there for matching start|promote Resources-operation: stateful1-demote: dropping requires Resources-operation: ... only start/promote operation taken into account Resources-operation: stateful2-promote: moving requires under meta_attributes as requires unless already defined there for matching start|promote diff --git a/xml/upgrade-2.10.xsl b/xml/upgrade-2.10.xsl index b2a9db6c6..f08956655 100644 --- a/xml/upgrade-2.10.xsl +++ b/xml/upgrade-2.10.xsl @@ -893,7 +893,9 @@ ) ) ]"/> - <xsl:if test="not($InnerSimulation)"> + <xsl:if test="not($InverseMode or $InnerSimulation) + or + $InnerPass = 'TRIGGER-MSG'"> <xsl:call-template name="MapMsg"> <xsl:with-param name="Context" select="../../@id"/> <xsl:with-param name="Replacement" select="$Replacement"/> @@ -957,11 +959,11 @@ )"> <!-- cf. trick C. (indicate for inverse mode) --> <xsl:choose> + <!-- instead of HelperDenormalizedSpace --> <xsl:when test="$InnerSimulation"> <xsl:value-of select="concat(@name, ' ')"/> </xsl:when> <xsl:otherwise> - <xsl:text> </xsl:text> <xsl:copy> <xsl:apply-templates select="@*"/> </xsl:copy> @@ -1206,6 +1208,14 @@ <xsl:call-template name="ProcessNonattrOpMetaAttributes"> <xsl:with-param name="Source" select="."/> <xsl:with-param name="InnerSimulation" select="true()"/> + <xsl:with-param name="InnerPass" + select="substring-after( + concat( + string($InnerSimulation), + 'TRIGGER-MSG' + ), + 'true' + )"/> </xsl:call-template> </xsl:variable> <!-- cf. trick A. --> @@ -1587,6 +1597,7 @@ <xsl:call-template name="ProcessNonattrOpMetaAttributes"> <xsl:with-param name="Source" select="."/> <xsl:with-param name="InverseMode" select="true()"/> + <xsl:with-param name="InnerSimulation" select="true()"/> </xsl:call-template> </xsl:variable> <!-- cf. trick A. --> @@ -1602,7 +1613,12 @@ <xsl:apply-templates select="node()[ name() != 'nvpair' ]"/> - <xsl:copy-of select="$ProcessedOpMetaAttributes"/> + <xsl:call-template name="ProcessNonattrOpMetaAttributes"> + <xsl:with-param name="Source" select="."/> + <xsl:with-param name="InverseMode" select="true()"/> + <!-- cf. trick E. --> + <xsl:with-param name="InnerPass" select="$ProcessedOpMetaAttributes"/> + </xsl:call-template> <xsl:apply-templates select="text()[position() = last()]"/> </xsl:copy> </xsl:if>
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
