File pacemaker-XML-upgrade-2.10.xsl-resource-meta_attributes-validity-conformance.patch of Package pacemaker.26413

commit 49183a93bf62c134b75668945920717a237ed9c2
Author: Jan Pokorný <jpokorny@redhat.com>
Date:   Mon May 14 17:16:48 2018 +0200

    XML: upgrade-2.10.xsl: resource meta_attributes: validity conformance
    
    Resolves an issue previously left open as of a43d9a076.  Nontrivial one.

diff --git a/xml/upgrade-2.10.xsl b/xml/upgrade-2.10.xsl
index 07b05582b..0a0dff03c 100644
--- a/xml/upgrade-2.10.xsl
+++ b/xml/upgrade-2.10.xsl
@@ -879,11 +879,6 @@
                           != $InnerPass
                           and
                           (
-                            not(preceding-sibling::nvpair)
-                            or
-                            generate-id(preceding-sibling::nvpair[1])
-                            != generate-id(preceding-sibling::*[1])
-                          ) or (
                             not(following-sibling::nvpair)
                             or
                             generate-id(following-sibling::nvpair[1])
@@ -970,6 +965,10 @@
                               =
                               substring-before($SimulateFollowingSiblings,
                                                concat('@', $Replacement/@with))">
+                  <xsl:call-template name="HelperDenormalizedSpace">
+                    <xsl:with-param name="Source" select="."/>
+                    <xsl:with-param name="InnerSimulation" select="$InnerSimulation"/>
+                  </xsl:call-template>
                   <xsl:copy>
                     <xsl:for-each select="@*">
                       <xsl:choose>
@@ -996,13 +995,11 @@
             </xsl:choose>
           </xsl:when>
           <xsl:otherwise>
-            <!-- XXX: emits superfluous empty lines with test-2/02[23],
-                      but keeps -B run green -->
             <xsl:call-template name="HelperDenormalizedSpace">
               <xsl:with-param name="Source" select="."/>
               <xsl:with-param name="InnerSimulation" select="$InnerSimulation"/>
             </xsl:call-template>
-           <xsl:call-template name="HelperIdentity"/>
+            <xsl:call-template name="HelperIdentity"/>
           </xsl:otherwise>
         </xsl:choose>
       </xsl:when>