[Debian-NP-Commits] r232 - people/vagrant/simple-cdd

[Vagrant Cascadian]

Author: vagrant-guest
Date: Mon Nov 22 19:45:05 2004
New Revision: 232

Modified:
   people/vagrant/simple-cdd/CONF.sh
   people/vagrant/simple-cdd/build-simple-cdd
Log:
more flexible and simple release selection


Modified: people/vagrant/simple-cdd/CONF.sh
==============================================================================
--- people/vagrant/simple-cdd/CONF.sh	(original)
+++ people/vagrant/simple-cdd/CONF.sh	Mon Nov 22 19:45:05 2004
@@ -318,19 +318,16 @@
 
 #export http_proxy=http://localhost:3128
 
-# use the sid installer
-use_sid_installer="false"
+# download a specific codename branch, such as sid.
+use_di_codename="$CODENAME"
 
-# FIXME put into build-simple-cdd script instead
-if [ "true" = "$use_sid_installer" ]; then
-  debpartial_di_codename="sid"
-else
-  debpartial_di_codename="$CODENAME"
-fi
+# download a specific installer release, such as 20041118 or rc2
+use_di_release="current"
+
+debian_installer_dir="dists/$use_di_codename/main/installer-i386/$use_di_release/"
 
 # debpartial-mirror.conf files variable
-# TODO if use_sid_installer is true, use sid instead
-debpartial_files="README doc/ tools/ indices/ dists/$debpartial_di_codename/main/installer-i386/current/"
+debpartial_files="README doc/ tools/ indices/ $debian_installer_dir"
 
 # debpartial-mirror server variable
 debpartial_debian_mirror="http://ftp.us.debian.org/debian/"

Modified: people/vagrant/simple-cdd/build-simple-cdd
==============================================================================
--- people/vagrant/simple-cdd/build-simple-cdd	(original)
+++ people/vagrant/simple-cdd/build-simple-cdd	Mon Nov 22 19:45:05 2004
@@ -74,11 +74,11 @@
   exit 1
 fi
 
-if [ "true" = "$use_sid_installer" ]; then
+if [ "$use_di_release" != "current" ] || [ "$use_di_codename" != "$CODENAME" ]; then
   cd $MIRROR/dists
-  echo "WARNING: using sid installer instead of $CODENAME installer"
+  echo "WARNING: using installer from: $use_di_codename $use_di_release"
   mkdir -p $CODENAME/main/installer-i386/current
-  rsync --delete -aWHr sid/main/installer-i386/current/. $CODENAME/main/installer-i386/current/
+  rsync --delete -aWHr $use_di_codename/main/installer-i386/$use_di_release/. $CODENAME/main/installer-i386/current/
 fi
 
 cd $BASEDIR