r3640 - jhalfs/branches/ablfs/BLFS/xsl

pierre at linuxfromscratch.org pierre at linuxfromscratch.org
Thu Dec 27 00:10:14 PST 2012


Author: pierre
Date: 2012-12-27 01:10:02 -0700 (Thu, 27 Dec 2012)
New Revision: 3640

Modified:
   jhalfs/branches/ablfs/BLFS/xsl/bump.xsl
   jhalfs/branches/ablfs/BLFS/xsl/gen_config.xsl
Log:
Correct a bug in xsl files, which made modules disappear when no other
package was present in a sublist.
+ make version bumping work for modules

Modified: jhalfs/branches/ablfs/BLFS/xsl/bump.xsl
===================================================================
--- jhalfs/branches/ablfs/BLFS/xsl/bump.xsl	2012-12-22 21:34:44 UTC (rev 3639)
+++ jhalfs/branches/ablfs/BLFS/xsl/bump.xsl	2012-12-27 08:10:02 UTC (rev 3640)
@@ -13,7 +13,8 @@
     <xsl:choose>
       <xsl:when test="$version='N'">
         <xsl:value-of select=
-            "document($packages)//package[string(name)=$package]/version"/>
+            "document($packages)//*[self::package or self::module]
+                                   [string(name)=$package]/version"/>
       </xsl:when>
       <xsl:otherwise>
         <xsl:value-of select="$version"/>

Modified: jhalfs/branches/ablfs/BLFS/xsl/gen_config.xsl
===================================================================
--- jhalfs/branches/ablfs/BLFS/xsl/gen_config.xsl	2012-12-22 21:34:44 UTC (rev 3639)
+++ jhalfs/branches/ablfs/BLFS/xsl/gen_config.xsl	2012-12-27 08:10:02 UTC (rev 3640)
@@ -63,7 +63,8 @@
 
   <xsl:template match="list">
     <xsl:if
-      test=".//package[(version and not(inst-version)) or
+      test=".//*[self::package or self::module]
+                    [(version and not(inst-version)) or
                       string(version) != string(inst-version)]">
       <xsl:text>config	MENU_</xsl:text>
       <xsl:value-of select="@id"/>
@@ -90,7 +91,8 @@
 
   <xsl:template match="sublist">
     <xsl:if
-      test=".//package[(version and not(inst-version)) or
+      test=".//*[self::package or self::module]
+                    [(version and not(inst-version)) or
                       string(version) != string(inst-version)]">
       <xsl:text>	config	MENU_</xsl:text>
       <xsl:value-of select="@id"/>




More information about the alfs-log mailing list