r2675 - jhalfs/branches/experimental/common

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Tue May 9 13:22:28 PDT 2006


Author: manuel
Date: 2006-05-09 14:22:28 -0600 (Tue, 09 May 2006)
New Revision: 2675

Modified:
   jhalfs/branches/experimental/common/common-functions
Log:
Merged r2674 from trunk.

Modified: jhalfs/branches/experimental/common/common-functions
===================================================================
--- jhalfs/branches/experimental/common/common-functions	2006-05-09 20:20:25 UTC (rev 2674)
+++ jhalfs/branches/experimental/common/common-functions	2006-05-09 20:22:28 UTC (rev 2675)
@@ -735,9 +735,9 @@
           # Remove the old file and download a new one
         rm -fv $FILE
           # Force generation of MD5SUM and storage in SRC_ARCHIVE
-        fromARCHIVE=0; HAVEMD5=0
-          # Try and retrieve the file
-        if ! wget -N $URL1 && ! wget -N $URL2 ; then
+        fromARCHIVE=0;
+          # Try and retrieve the file. Servers in reverse order.
+        if ! wget $URL2 && ! wget $URL1 ; then
           gs_wrt_message "$FILE not found on the servers.. SKIPPING"
           continue
         fi
@@ -747,6 +747,8 @@
       # Validate the MD5SUM one last time
     if [[ "$HAVEMD5" = "1" ]] && ! echo "$MD5" | md5sum -c - >/dev/null ; then
       gs_wrt_message "$FILE does not match MD5SUMS value"
+      # Force generation of MD5SUM
+      HAVEMD5=0
     fi
 
       # Generate a fresh MD5SUM for this file




More information about the alfs-log mailing list