r3885 - jhalfs/branches/new_features/BLFS/xsl

pierre at higgs.linuxfromscratch.org pierre at higgs.linuxfromscratch.org
Mon Feb 27 06:00:04 PST 2017


Author: pierre
Date: Mon Feb 27 06:00:04 2017
New Revision: 3885

Log:
Invert the logic for downloading tarballs:
- First upstream url
- Second upstrem ftp
- Last mirror server.
This allows to test whether upstream links are alive

Modified:
   jhalfs/branches/new_features/BLFS/xsl/scripts.xsl

Modified: jhalfs/branches/new_features/BLFS/xsl/scripts.xsl
==============================================================================
--- jhalfs/branches/new_features/BLFS/xsl/scripts.xsl	Mon Feb 27 05:57:52 2017	(r3884)
+++ jhalfs/branches/new_features/BLFS/xsl/scripts.xsl	Mon Feb 27 06:00:04 2017	(r3885)
@@ -222,21 +222,23 @@
     <xsl:text> $</xsl:text>
     <xsl:value-of select="$varname"/>
     <xsl:text>&#xA;  else&#xA;</xsl:text>
-    <!-- The FTP_SERVER mirror -->
-    <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"/>
+    <!-- Download from upstream http -->
     <xsl:if test="string-length($httpurl) > 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) > 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:value-of select="$first_letter"/>
+    <xsl:text>/$</xsl:text>
+    <xsl:value-of select="$varname"/>
     <xsl:text>
     cp $</xsl:text>
     <xsl:value-of select="$varname"/>


More information about the alfs-log mailing list