File pacemaker-XML-upgrade-2.10.xsl-simplify-1-2-res... of Package pacemaker.21299

Overview Repositories Revisions Requests Users Attributes Meta

File pacemaker-XML-upgrade-2.10.xsl-simplify-1-2-resource-instance_attributes.patch of Package pacemaker.21299

commit c8b4ae41655e5bffc2ac9a79d30312463f01ab39
Author: Jan Pokorný <jpokorny@redhat.com>
Date:   Fri May 4 19:04:40 2018 +0200

XML: upgrade-2.10.xsl: simplify 1/2: resource instance_attributes
    
    InverseMode is not relevant in this context.  Also a minor reformat
    and simplification using "HelperIdentity" named template.

diff --git a/xml/upgrade-2.10.xsl b/xml/upgrade-2.10.xsl
index 29c17d6a7..8a4319fcf 100644
--- a/xml/upgrade-2.10.xsl
+++ b/xml/upgrade-2.10.xsl
@@ -212,8 +212,9 @@
 
 <xsl:variable name="MapResourceInstanceAttributes"
               select="document('')/xsl:stylesheet
-                        /cibtr:map/cibtr:table[@for = 'resource-instance-attributes'
-                      ]"/>
+                        /cibtr:map/cibtr:table[
+                          @for = 'resource-instance-attributes'
+                        ]"/>
 
 <xsl:variable name="MapResourcesOperation"
               select="document('')/xsl:stylesheet
@@ -656,13 +657,10 @@
  -->
 <xsl:template name="ProcessRscInstanceAttributes">
   <xsl:param name="Source"/>
-  <xsl:param name="InverseMode" select="false()"/>
   <xsl:param name="InnerSimulation" select="false()"/>
   <xsl:param name="InnerPass">
     <xsl:choose>
-      <xsl:when test="$InverseMode
-                      or
-                      $InnerSimulation">
+      <xsl:when test="$InnerSimulation">
         <xsl:value-of select="''"/>
       </xsl:when>
       <xsl:otherwise>
@@ -677,9 +675,7 @@
   
   <xsl:for-each select="$Source/node()">
     <xsl:choose>
-      <xsl:when test="self::text()
-                      and
-                      not($InverseMode)">
+      <xsl:when test="self::text()">
         
         <xsl:choose>
           <xsl:when test="normalize-space($InnerPass)
@@ -755,7 +751,7 @@
                                   )
                                 )
                               ]"/>
-        <xsl:if test="not($InverseMode or $InnerSimulation)">
+        <xsl:if test="not($InnerSimulation)">
           <xsl:call-template name="MapMsg">
             <xsl:with-param name="Context" select="@id"/>
             <xsl:with-param name="Replacement" select="$Replacement"/>
@@ -764,16 +760,11 @@
         <xsl:choose>
           <xsl:when test="$Replacement
                           and
-                          (
-                            not(string($Replacement/@with))
-                            or
-                            $Replacement/@where
-                          )">
+                          not(string($Replacement/@with))">
             
           </xsl:when>
-          <xsl:when test="$InverseMode"/>
           <xsl:when test="$Replacement">
-            
+            
             <xsl:call-template name="HelperDenormalizedSpace">
               <xsl:with-param name="Source" select="."/>
               <xsl:with-param name="InnerSimulation" select="$InnerSimulation"/>
@@ -814,21 +805,12 @@
               <xsl:with-param name="Source" select="."/>
               <xsl:with-param name="InnerSimulation" select="$InnerSimulation"/>
             </xsl:call-template>
-            <xsl:copy>
-              <xsl:apply-templates select="@*|node()"/>
-            </xsl:copy>
+            <xsl:call-template name="HelperIdentity"/>
           </xsl:otherwise>
         </xsl:choose>
       </xsl:when>
-      <xsl:when test="$InverseMode
-                      or
-                      self::comment()">
-        
-      </xsl:when>
       <xsl:otherwise>
-        <xsl:copy>
-          <xsl:apply-templates select="@*|node()"/>
-        </xsl:copy>
+        <xsl:call-template name="HelperIdentity"/>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:for-each>

Places

File pacemaker-XML-upgrade-2.10.xsl-simplify-1-2-resource-instance_attributes.patch of Package pacemaker.21299

Places