Changeset ed4f11f for BLFS/xsl/scripts.xsl

Timestamp:

02/27/2017 02:00:04 PM (8 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

new_features

Children:

6c9002b

Parents:

1cf1ad6

Message:

Invert the logic for downloading tarballs:

• First upstream url
• Second upstrem ftp
• Last mirror server.

This allows to test whether upstream links are alive

File:

• BLFS/xsl/scripts.xsl (modified) (1 diff)

BLFS/xsl/scripts.xsl

@@ -223 +223 @@
     <xsl:value-of select="$varname"/>
     <xsl:text>&#xA;  else&#xA;</xsl:text>
-    <!-- The FTP_SERVER mirror -->
+    <!-- Download from upstream http -->
+    <xsl:if test="string-length($httpurl) &gt; 10">
+      <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: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:if test="string-length($httpurl) &gt; 10">
-      <xsl:text> ||
-    wget -T 30 -t 5 </xsl:text>
-      <xsl:value-of select="$httpurl"/>
-    </xsl:if>
-    <xsl:if test="string-length($ftpurl) &gt; 10">
-      <xsl:text> ||
-    wget -T 30 -t 5 </xsl:text>
-      <xsl:value-of select="$ftpurl"/>
-    </xsl:if>
     <xsl:text>
     cp $</xsl:text>