Changeset 8dc4646

Timestamp:

03/16/2017 12:49:01 PM (7 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

2.4, ablfs-more, legacy, trunk

Children:

2cf28dc

Parents:

39dc04a

Message:

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

File:

• BLFS/xsl/scripts.xsl (modified) (4 diffs)

BLFS/xsl/scripts.xsl

@@ -222 +222 @@
     <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>
@@ -241 +230 @@
     <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>
@@ -250 +240 @@
     <!-- 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:value-of select="$varname"/>
-    <xsl:text> $SRC_ARCHIVE
-  fi-->
+    <xsl:text><!--
+    cp $</xsl:text>
+    <xsl:value-of select="$varname"/>
+    <xsl:text> $SRC_ARCHIVE-->
+  fi
 fi
 </xsl:text>
@@ -277 +267 @@
      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