Changeset 7a100d96

Timestamp:

05/06/2006 08:04:45 PM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

experimental

Children:

50b9f16

Parents:

eb0837b

Message:

Merged r2658 from trunk.

Location:

common

Files:

• common-functions (modified) (2 diffs)
• urls.xsl (modified) (2 diffs)

common/common-functions

@@ -647 +647 @@
 #----------------------------#
   local saveIFS=$IFS
-  local IFS line URL1 URL2 FILE MD5 HAVEMD5 fromARCHIVE
+  local IFS line URL1 URL2 FILE BOOKMD5 MD5 HAVEMD5 fromARCHIVE
 
     # Test if the packages must be downloaded
@@ -687 +687 @@
     URL1=`echo $line | cut -d" " -f2` # Preferred URL
     URL2=`echo $line | cut -d" " -f1` # Fallback Upstream URL
-    FILE=`basename $URL2` # File name
-
-      # Find the md5 sum for this package.
-    set +e
-    HAVEMD5=1  # Always assume we have a MD5SUM
-    MD5=`grep "  $FILE" MD5SUMS`
-    if [ $? -ne 0 ]; then
-      set -e
-      gs_wrt_message "$FILE not found in MD5SUMS"
-        # IMPORTANT:: There is no MD5SUM for this file.
-      HAVEMD5=0
+    FILE=`basename $URL1` # File name
+    BOOKMD5=`echo $line | cut -d" " -f3` # MD5 book value
+
+    if [[ x"$BOOKMD5" != "x" ]]; then
+      HAVEMD5=1
+      MD5="$BOOKMD5  $FILE"
+    else
+      # Find the md5 sum for this package in the server MD5SUMS file.
+      set +e
+      HAVEMD5=1  # Always assume we have a MD5SUM
+      MD5=`grep "  $FILE" MD5SUMS`
+      if [ $? -ne 0 ]; then
+        set -e
+        gs_wrt_message "$FILE not found in MD5SUMS"
+          # IMPORTANT:: There is no MD5SUM for this file.
+        HAVEMD5=0
+      fi
     fi
 

common/urls.xsl

@@ -42 +42 @@
       <xsl:variable name="dirname" select="substring-before($package2, '-0')"/>
       <!-- Write the upstream URLs, except the redirected ones -->
-      <xsl:if test="not(contains(@url,'?'))">
-        <xsl:value-of select="@url"/>
-      </xsl:if>
+      <xsl:choose>
+        <xsl:when test="contains(@url,'?')">
+          <xsl:text>dummy-url</xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="@url"/>
+        </xsl:otherwise>
+      </xsl:choose>
       <xsl:text> </xsl:text>
+      <!-- Write FTP mirror URLs -->
       <xsl:value-of select="$server"/>
       <xsl:text>/pub/lfs/conglomeration/</xsl:text>
@@ -75 +81 @@
       </xsl:choose>
       <xsl:value-of select="$package"/>
+      <!-- Write MD5SUM value -->
+      <xsl:text> </xsl:text>
+      <xsl:value-of select="../../para[3]/literal"/>
       <xsl:text>&#x0a;</xsl:text>
     </xsl:if>