r3251 - in jhalfs/trunk: BLFS/libs common

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Mon Dec 4 09:47:52 PST 2006


Author: manuel
Date: 2006-12-04 10:47:37 -0700 (Mon, 04 Dec 2006)
New Revision: 3251

Modified:
   jhalfs/trunk/BLFS/libs/scripts.xsl
   jhalfs/trunk/common/urls.xsl
Log:
Solved download from sourceforge URLs

Modified: jhalfs/trunk/BLFS/libs/scripts.xsl
===================================================================
--- jhalfs/trunk/BLFS/libs/scripts.xsl	2006-12-04 13:48:48 UTC (rev 3250)
+++ jhalfs/trunk/BLFS/libs/scripts.xsl	2006-12-04 17:47:37 UTC (rev 3251)
@@ -356,10 +356,16 @@
         <!-- The FTP_SERVER mirror -->
         <xsl:text>    wget ${FTP_SERVER}conglomeration/$PKG_DIR/$PACKAGE</xsl:text>
         <!-- Upstream HTTP URL -->
-        <xsl:if test="string-length(ulink/@url) > '10' and
-                      not(contains(string(ulink/@url),'sourceforge'))">
+        <xsl:if test="string-length(ulink/@url) > '10'">
           <xsl:text> || \&#xA;    wget </xsl:text>
-          <xsl:value-of select="ulink/@url"/>
+          <xsl:choose>
+            <xsl:when test="contains(ulink/@url,'?')">
+              <xsl:value-of select="substring-before(ulink/@url,'?')"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:value-of select="ulink/@url"/>
+            </xsl:otherwise>
+          </xsl:choose>
         </xsl:if>
       </xsl:when>
       <xsl:when test="contains(string(),'FTP')">

Modified: jhalfs/trunk/common/urls.xsl
===================================================================
--- jhalfs/trunk/common/urls.xsl	2006-12-04 13:48:48 UTC (rev 3250)
+++ jhalfs/trunk/common/urls.xsl	2006-12-04 17:47:37 UTC (rev 3251)
@@ -42,10 +42,10 @@
         <xsl:value-of select="$cut"/>
       </xsl:variable>
       <xsl:variable name="dirname" select="substring-before($package2, '-0')"/>
-      <!-- Write the upstream URLs, except the redirected ones -->
+      <!-- Write the upstream URLs, fixing the redirected ones -->
       <xsl:choose>
         <xsl:when test="contains(@url,'?')">
-          <xsl:text>dummy-url</xsl:text>
+          <xsl:value-of select="substring-before(@url,'?')"/>
         </xsl:when>
         <xsl:otherwise>
           <xsl:value-of select="@url"/>




More information about the alfs-log mailing list