From e51fab2cc5c59220d9e22d2a14bb56d4ad87cd58 Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pierre@linuxfromscratch.org>
Date: Thu, 27 Dec 2012 08:10:02 +0000
Subject: [PATCH] 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

---
 BLFS/xsl/bump.xsl       | 3 ++-
 BLFS/xsl/gen_config.xsl | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/BLFS/xsl/bump.xsl b/BLFS/xsl/bump.xsl
index a918bfa..1f368a7 100644
--- a/BLFS/xsl/bump.xsl
+++ b/BLFS/xsl/bump.xsl
@@ -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"/>
diff --git a/BLFS/xsl/gen_config.xsl b/BLFS/xsl/gen_config.xsl
index 993e1e8..22680e8 100644
--- a/BLFS/xsl/gen_config.xsl
+++ b/BLFS/xsl/gen_config.xsl
@@ -63,7 +63,8 @@ config  SUDO
 
   <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&#9;MENU_</xsl:text>
       <xsl:value-of select="@id"/>
@@ -90,7 +91,8 @@ depends MENU_</xsl:text>
 
   <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>&#9;config&#9;MENU_</xsl:text>
       <xsl:value-of select="@id"/>