r3811 - jhalfs/trunk/LFS

pierre at higgs.linuxfromscratch.org pierre at higgs.linuxfromscratch.org
Sat Nov 29 12:43:35 PST 2014


Author: pierre
Date: Sat Nov 29 12:43:35 2014
New Revision: 3811

Log:
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

Modified:
   jhalfs/trunk/LFS/lfs.xsl

Modified: jhalfs/trunk/LFS/lfs.xsl
==============================================================================
--- jhalfs/trunk/LFS/lfs.xsl	Mon Nov 17 12:46:38 2014	(r3810)
+++ jhalfs/trunk/LFS/lfs.xsl	Sat Nov 29 12:43:35 2014	(r3811)
@@ -126,17 +126,19 @@
       <xsl:apply-templates select="sect2|
                                    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>
       <xsl:text>exit&#xA;</xsl:text>
@@ -532,7 +534,7 @@
             </xsl:when>
             <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"
                     select="substring-after($outputstring,'make')"/>


More information about the alfs-log mailing list