Changeset e6e0c85 for LFS/lfs.xsl

Timestamp:

11/29/2014 08:43:35 PM (10 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

2.4, ablfs-more, legacy, new_features, trunk

Children:

a983256

Parents:

c5650f9

Message:

Fix a long standing bug in lfs.xsl, which tried to use packageManager.xml
when Package management was not in use, resulting in errors in
000-masterscript.log
Also correct a typo

File:

• LFS/lfs.xsl (modified) (2 diffs)

LFS/lfs.xsl

@@ -127 +127 @@
                                    screen[not(@role) or
                                           @role!='nodump']/userinput"/>
-      <xsl:if test="@id='ch-system-creatingdirs'">
+      <xsl:if test="@id='ch-system-creatingdirs' and $pkgmngt='y'">
         <xsl:apply-templates
            select="document('packageManager.xml')//sect1[
                                        @id='ch-pkgmngt-creatingdirs'
-                                                        ]//userinput"/>
+                                                        ]//userinput"
+           mode="pkgmngt"/>
       </xsl:if>
-      <xsl:if test="@id='ch-system-createfiles'">
+      <xsl:if test="@id='ch-system-createfiles' and $pkgmngt='y'">
         <xsl:apply-templates
            select="document('packageManager.xml')//sect1[
                                        @id='ch-pkgmngt-createfiles'
-                                                        ]//userinput"/>
+                                                        ]//userinput"
+           mode="pkgmngt"/>
       </xsl:if>
       <xsl:text>echo -e "\n\nTotalseconds: $SECONDS\n"&#xA;</xsl:text>
@@ -533 +535 @@
             <xsl:otherwise>
               <xsl:text>make DESTDIR=$PKG_DEST</xsl:text>
-              <xsl:call-template name="outputpkgdest">>
+              <xsl:call-template name="outputpkgdest">
                 <xsl:with-param
                     name="outputstring"