changeset 668:e7eb5123258c

Support PREFERRED_MIRROR for USE_UNSTABLE.
author Rob Landley <rob@landley.net>
date Sun, 29 Mar 2009 15:51:24 -0500
parents 0320ff2bcdd4
children 1cf41855bb85
files sources/functions.sh
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/sources/functions.sh	Sun Mar 29 06:45:38 2009 -0500
+++ b/sources/functions.sh	Sun Mar 29 15:51:24 2009 -0500
@@ -185,7 +185,8 @@
 
   if [ -n "$1" ]
   then
-    wget -t 2 -T 20 -O "$SRCDIR/$FILENAME" "$1" || return 2
+    wget -t 2 -T 20 -O "$SRCDIR/$FILENAME" "$1" ||
+      (rm "$SRCDIR/$FILENAME"; return 2)
   fi
 
   try_checksum
@@ -211,7 +212,8 @@
     touch -c "$SRCDIR/$FILENAME" 2>/dev/null
 
     # Download new one as alt-packagename.tar.ext
-    FILENAME="$ALTFILENAME" SHA1= try_download "$UNSTABLE"
+    FILENAME="$ALTFILENAME" SHA1= try_download "$UNSTABLE" ||
+      ([ ! -z "$PREFERRED_MIRROR" ] && SHA1= FILENAME="$ALTFILENAME" try_download "$PREFERRED_MIRROR/$ALTFILENAME")
     return $?
   fi