[ Petter Reinholdtsen ]

* Update tools/grab_md5 to use the same variable name (SUITE->CODENAME)
    as the rest of the code, to reduse confusion.
This commit is contained in:
Petter Reinholdtsen 2007-07-30 07:36:39 +00:00
parent 79c1614a0a
commit b770dfe6d2
2 changed files with 9 additions and 5 deletions

4
debian/changelog vendored
View File

@ -47,6 +47,10 @@ debian-cd (3.0.3) UNRELEASED; urgency=low
[ Steve McIntyre ] [ Steve McIntyre ]
* Update unstable-map: in the Makefile - use lenny rather than etch * Update unstable-map: in the Makefile - use lenny rather than etch
[ Petter Reinholdtsen ]
* Update tools/grab_md5 to use the same variable name (SUITE->CODENAME)
as the rest of the code, to reduse confusion.
-- Frans Pop <fjp@debian.org> Thu, 26 Jul 2007 03:19:01 +0200 -- Frans Pop <fjp@debian.org> Thu, 26 Jul 2007 03:19:01 +0200
debian-cd (3.0.2) unstable; urgency=high debian-cd (3.0.2) unstable; urgency=high

View File

@ -10,13 +10,13 @@
MIRROR=$1 MIRROR=$1
ARCHES="$2" ARCHES="$2"
SUITE=$3 CODENAME=$3
DI_SUITE=$4 DI_CODENAME=$4
OUT=$5 OUT=$5
for ARCH in $ARCHES for ARCH in $ARCHES
do do
LOCATIONS="$MIRROR/dists/$SUITE/ $MIRROR/dists/$DI_SUITE/" LOCATIONS="$MIRROR/dists/$CODENAME/ $MIRROR/dists/$DI_CODENAME/"
echo "Looking in $LOCATIONS" echo "Looking in $LOCATIONS"
case $ARCH in case $ARCH in
@ -64,12 +64,12 @@ do
}' | sort | uniq >> $OUT }' | sort | uniq >> $OUT
# Use the new D-I images. Do NOT use the "current" # Use the new D-I images. Do NOT use the "current"
# link; it causes problems with overlaid files... # link; it causes problems with overlaid files...
for VER in $MIRROR/dists/$DI_SUITE/main/installer-$ARCH/* for VER in $MIRROR/dists/$DI_CODENAME/main/installer-$ARCH/*
do do
if [ -d $VER ] && [ ! -L $VER ] ; then if [ -d $VER ] && [ ! -L $VER ] ; then
FILE=$VER/images/MD5SUMS FILE=$VER/images/MD5SUMS
echo "Using MD5 sums from d-i: $FILE" echo "Using MD5 sums from d-i: $FILE"
LOC=dists/$DI_SUITE/main/installer-$ARCH/`basename $VER`/images LOC=dists/$DI_CODENAME/main/installer-$ARCH/`basename $VER`/images
for ENTRY in `cat $FILE | sed 's/ /:/g'` for ENTRY in `cat $FILE | sed 's/ /:/g'`
do do
PATH=`echo $ENTRY | /bin/sed "s?^.*:\./?$MIRROR/$LOC/?g"` PATH=`echo $ENTRY | /bin/sed "s?^.*:\./?$MIRROR/$LOC/?g"`