diff sources/download_functions.sh @ 1461:ad5303b6d35a

Switch USE_UNSTABLE to USE_ALT and download.sh's UNSTABLE= to ALT= so naming is consistent with the alt- prefixes on packages and patches.
author Rob Landley <rob@landley.net>
date Thu, 20 Oct 2011 02:07:10 -0500
parents f2f1238d25e2
children d398569effd2
line wrap: on
line diff
--- a/sources/download_functions.sh	Thu Oct 20 02:05:11 2011 -0500
+++ b/sources/download_functions.sh	Thu Oct 20 02:07:10 2011 -0500
@@ -57,10 +57,10 @@
 {
   mkdir -p "$SRCTREE" || dienow
 
-  # Figure out whether we're using an unstable package.
+  # Figure out whether we're using an alternative version of a package.
 
   PACKAGE="$1"
-  is_in_list "$PACKAGE" $USE_UNSTABLE && PACKAGE=alt-"$PACKAGE"
+  is_in_list "$PACKAGE" $USE_ALT && PACKAGE=alt-"$PACKAGE"
 
   # Announce to the world that we're cracking open a new package
 
@@ -197,8 +197,8 @@
 
   echo -ne "checking $FILENAME\r"
 
-  # Update timestamps on both stable and unstable tarballs (if any)
-  # so cleanup_oldfiles doesn't delete stable when we're building unstable
+  # Update timestamps on both stable and alternative tarballs (if any)
+  # so cleanup_oldfiles doesn't delete stable when we're building alt
   # or vice versa
 
   touch -c "$SRCDIR"/{"$FILENAME","$ALTFILENAME"} 2>/dev/null
@@ -206,10 +206,10 @@
   # Give package name, minus file's version number and archive extension.
   BASENAME="$(noversion "$FILENAME")"
 
-  # If unstable version selected, try from listed location, and fall back
-  # to PREFERRED_MIRROR.  Do not try normal mirror locations for unstable.
+  # If alternative version selected, try from listed location, and fall back
+  # to PREFERRED_MIRROR.  Do not try normal mirror locations for alt packages.
 
-  if is_in_list "$BASENAME" $USE_UNSTABLE
+  if is_in_list "$BASENAME" $USE_ALT
   then
     # If extracted source directory exists, don't download alt-tarball.
     if [ -e "$SRCTREE/alt-$BASENAME" ]
@@ -224,7 +224,7 @@
 
     ([ ! -z "$PREFERRED_MIRROR" ] &&
       download_from "$PREFERRED_MIRROR/$ALTFILENAME") ||
-      download_from "$UNSTABLE"
+      download_from "$ALT"
     return $?
   fi