From 8dc464678e10b1c1b50afeb5428bea361af9b995 Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pierre@linuxfromscratch.org>
Date: Thu, 16 Mar 2017 12:49:01 +0000
Subject: [PATCH] Merge new_features: Allows to retrieve package from
 SRC_ARCHIVE, in case it is not already there     and is in archive. This
 should not happen in normal operation, but may happen     in
 func_install_blfs

---
 BLFS/xsl/scripts.xsl | 35 ++++++++++++-----------------------
 1 file changed, 12 insertions(+), 23 deletions(-)

diff --git a/BLFS/xsl/scripts.xsl b/BLFS/xsl/scripts.xsl
index c433a2e..4501514 100644
--- a/BLFS/xsl/scripts.xsl
+++ b/BLFS/xsl/scripts.xsl
@@ -221,48 +221,38 @@ cd $UNPACKDIR&#xA;
     <xsl:value-of select="$package"/>
     <xsl:text>&#xA;if [[ ! -f $</xsl:text>
     <xsl:value-of select="$varname"/>
-    <xsl:text> ]] ; then&#xA;</xsl:text>
-    <!-- This whole code becomes obsolete because now, it is there or we
-         download; keeping for now, and we may want to grab it from
-         SRC_ARCHIVE when SRC_SUBDIRS is set...
-    <xsl:text>  if [[ -f $SRC_ARCHIVE/$PKG_DIR/$</xsl:text>
-    <xsl:value-of select="$varname"/>
-    <xsl:text> ]] ; then&#xA;</xsl:text>
-    <xsl:text>    cp $SRC_ARCHIVE/$PKG_DIR/$</xsl:text>
-    <xsl:value-of select="$varname"/>
-    <xsl:text> $</xsl:text>
-    <xsl:value-of select="$varname"/>
-    <xsl:text>&#xA;</xsl:text>
-    <xsl:text>  elif [[ -f $SRC_ARCHIVE/$</xsl:text>
+    <xsl:text> ]] ; then
+  if [[ -f $SRC_ARCHIVE/$</xsl:text>
     <xsl:value-of select="$varname"/>
     <xsl:text> ]] ; then&#xA;</xsl:text>
     <xsl:text>    cp $SRC_ARCHIVE/$</xsl:text>
     <xsl:value-of select="$varname"/>
     <xsl:text> $</xsl:text>
     <xsl:value-of select="$varname"/>
-    <xsl:text>&#xA;  else&#xA;</xsl:text> -->
+    <xsl:text>
+  else&#xA;</xsl:text>
     <!-- Download from upstream http -->
     <xsl:if test="string-length($httpurl) &gt; 10">
-      <xsl:text>  wget -T 30 -t 5 </xsl:text>
+      <xsl:text>    wget -T 30 -t 5 </xsl:text>
       <xsl:value-of select="$httpurl"/>
       <xsl:text> ||&#xA;</xsl:text>
     </xsl:if>
     <!-- Download from upstream ftp -->
     <xsl:if test="string-length($ftpurl) &gt; 10">
-      <xsl:text>  wget -T 30 -t 5 </xsl:text>
+      <xsl:text>    wget -T 30 -t 5 </xsl:text>
       <xsl:value-of select="$ftpurl"/>
       <xsl:text> ||&#xA;</xsl:text>
     </xsl:if>
     <!-- The FTP_SERVER mirror as a last resort -->
-    <xsl:text>  wget -T 30 -t 5 ${FTP_SERVER}svn/</xsl:text>
+    <xsl:text>    wget -T 30 -t 5 ${FTP_SERVER}svn/</xsl:text>
     <xsl:value-of select="$first_letter"/>
     <xsl:text>/$</xsl:text>
     <xsl:value-of select="$varname"/>
-    <xsl:text>
-<!--    cp $</xsl:text>
+    <xsl:text><!--
+    cp $</xsl:text>
     <xsl:value-of select="$varname"/>
-    <xsl:text> $SRC_ARCHIVE
-  fi-->
+    <xsl:text> $SRC_ARCHIVE-->
+  fi
 fi
 </xsl:text>
     <xsl:if test="string-length($md5) &gt; 10">
@@ -276,8 +266,7 @@ fi
 <!-- link additional packages into $BUILD_DIR, because they are supposed to
      be there-->
     <xsl:if test="string($varname) != 'PACKAGE'">
-      <xsl:text>
-[[ "$SRC_DIR" != "$BUILD_DIR" ]] &amp;&amp; ln -sf $SRC_DIR/$</xsl:text>
+      <xsl:text>[[ "$SRC_DIR" != "$BUILD_DIR" ]] &amp;&amp; ln -sf $SRC_DIR/$</xsl:text>
       <xsl:value-of select="$varname"/>
       <xsl:text> $BUILD_DIR
 </xsl:text>