From ee72025828634d9ebfbe2ab4a75849a3409d87da Mon Sep 17 00:00:00 2001 From: Frank Lichtenheld Date: Sun, 2 Sep 2007 14:06:11 +0200 Subject: [PATCH] Switch to using codenames Use codenames for suites instead of alias names where possible. --- config.sh.sed.in | 16 ++++++++-------- cron.d/100syncarchive | 2 +- cron.d/100syncarchive_amd64 | 2 +- cron.d/100syncarchive_backports | 12 ++++++------ cron.d/100syncarchive_gnuab | 2 +- cron.d/100syncarchive_volatile | 2 +- cron.d/120synctrans | 4 ++-- cron.d/600prepare_newpkg | 8 ++++---- lib/Packages/Dispatcher.pm | 6 +++++- 9 files changed, 29 insertions(+), 25 deletions(-) diff --git a/config.sh.sed.in b/config.sh.sed.in index e392f33..361bf70 100644 --- a/config.sh.sed.in +++ b/config.sh.sed.in @@ -42,17 +42,17 @@ ddtplangs="de cs da eo es fi fr hu it ja nl pl pt_BR pt_PT ru sk sv_SE uk" archives="us security amd64 gnuab backports volatile" sections="main contrib non-free" parts="$sections" -suites="oldstable oldstable-volatile oldstable-backports stable etch-m68k stable-volatile stable-backports testing unstable experimental" +suites="sarge sarge-volatile sarge-backports etch etch-m68k etch-volatile etch-backports lenny sid experimental" priorities="required important standard optional extra" dists="$suites" architectures="alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-i386 kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc" -arch_oldstable="alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc" -arch_stable="alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc" -arch_testing="${arch_stable}" -arch_unstable="${arch_oldstable} armel hurd-i386 kfreebsd-i386 kfreebsd-amd64" -arch_experimental="${arch_unstable}" -arch_testing_proposed_updates="${arch_testing}" -arch_stable_proposed_updates="${arch_stable}" +arch_sarge="alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc" +arch_etch="alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc" +arch_lenny="${arch_etch}" +arch_sid="${arch_sarge} armel hurd-i386 kfreebsd-i386 kfreebsd-amd64" +arch_experimental="${arch_sid}" +arch_lenny_proposed_updates="${arch_lenny}" +arch_etch_proposed_updates="${arch_etch}" # Miscellaneous # diff --git a/cron.d/100syncarchive b/cron.d/100syncarchive index 928fefc..1436bd9 100755 --- a/cron.d/100syncarchive +++ b/cron.d/100syncarchive @@ -86,7 +86,7 @@ fi # security archive # -for dist in oldstable stable testing +for dist in sarge etch lenny do echo "retrieve Release(.gpg) $dist" test -d security/${dist} || mkdir -p security/${dist} diff --git a/cron.d/100syncarchive_amd64 b/cron.d/100syncarchive_amd64 index 03fd109..417e8c6 100755 --- a/cron.d/100syncarchive_amd64 +++ b/cron.d/100syncarchive_amd64 @@ -9,7 +9,7 @@ cd ${archivedir} # arch=amd64 -for dist in oldstable +for dist in sarge do echo "retrieve Release(.gpg) $dist" test -d amd64/${dist} || mkdir -p amd64/${dist} diff --git a/cron.d/100syncarchive_backports b/cron.d/100syncarchive_backports index 6411eb1..be82d5f 100755 --- a/cron.d/100syncarchive_backports +++ b/cron.d/100syncarchive_backports @@ -7,13 +7,13 @@ cd ${archivedir} # backports archive # -for dist in oldstable +for dist in sarge etch do echo "retrieve Release(.gpg) $dist-backports" test -d backports/${dist}-backports || mkdir -p backports/${dist}-backports (cd backports/${dist}-backports && - wget -q -N ${backports_ftpsite}/dists/sarge-backports/Release && - wget -q -N ${backports_ftpsite}/dists/sarge-backports/Release.gpg ) + wget -q -N ${backports_ftpsite}/dists/${dist}-backports/Release && + wget -q -N ${backports_ftpsite}/dists/${dist}-backports/Release.gpg ) foo=\$arch_${dist//-/_} for arch in `eval echo $foo` @@ -23,17 +23,17 @@ do echo retrieve Packages $dist-backports/$part/$arch test -d backports/${dist}-backports/${part}/binary-${arch} || mkdir -p backports/${dist}-backports/${part}/binary-${arch} (cd backports/${dist}-backports/${part}/binary-${arch} && - wget -q -N ${backports_ftpsite}/dists/sarge-backports/${part}/binary-${arch}/Packages.gz) + wget -q -N ${backports_ftpsite}/dists/${dist}-backports/${part}/binary-${arch}/Packages.gz) done echo retrieve Contents $dist-backports/$arch (cd backports/${dist}-backports && - wget -q -N ${backports_ftpsite}/dists/sarge-backports/Contents-${arch}.gz) + wget -q -N ${backports_ftpsite}/dists/${dist}-backports/Contents-${arch}.gz) done for part in ${parts} do echo retrieve Sources $dist-backports/$part test -d backports/${dist}-backports/${part}/source || mkdir -p backports/${dist}-backports/${part}/source (cd backports/${dist}-backports/${part}/source && - wget -q -N ${backports_ftpsite}/dists/sarge-backports/${part}/source/Sources.gz) + wget -q -N ${backports_ftpsite}/dists/${dist}-backports/${part}/source/Sources.gz) done done diff --git a/cron.d/100syncarchive_gnuab b/cron.d/100syncarchive_gnuab index 1295c63..b42d165 100755 --- a/cron.d/100syncarchive_gnuab +++ b/cron.d/100syncarchive_gnuab @@ -9,7 +9,7 @@ cd ${archivedir} # architectures="armel kfreebsd-i386 kfreebsd-amd64" -for dist in unstable experimental +for dist in sid experimental do echo "retrieve Release(.gpg) $dist" test -d gnuab/${dist} || mkdir -p gnuab/${dist} diff --git a/cron.d/100syncarchive_volatile b/cron.d/100syncarchive_volatile index b8cef9a..ab2bf5e 100755 --- a/cron.d/100syncarchive_volatile +++ b/cron.d/100syncarchive_volatile @@ -7,7 +7,7 @@ cd ${archivedir} # volatile archive # -for dist in oldstable stable +for dist in sarge etch do echo "retrieve Release(.gpg) $dist-volatile" test -d volatile/${dist}-volatile || mkdir -p volatile/${dist}-volatile diff --git a/cron.d/120synctrans b/cron.d/120synctrans index add4c35..12767ab 100755 --- a/cron.d/120synctrans +++ b/cron.d/120synctrans @@ -8,7 +8,7 @@ cd ${archivedir} if [ -z "${localdir}" ] then echo using remote mirror - for dist in unstable + for dist in sid do for part in main do @@ -23,7 +23,7 @@ then done else echo using local mirror - for dist in unstable + for dist in sid do for part in main do diff --git a/cron.d/600prepare_newpkg b/cron.d/600prepare_newpkg index 083d72e..bddf65b 100755 --- a/cron.d/600prepare_newpkg +++ b/cron.d/600prepare_newpkg @@ -5,11 +5,11 @@ packagesdir=${filesdir}/packages test -d ${packagesdir} || mkdir -p ${packagesdir} -LANG=C cat ${filesdir}/db/package_names_unstable.txt \ - | sort | uniq > ${packagesdir}/package_names_unstable.$(date -I) +LANG=C cat ${filesdir}/db/package_names_sid.txt \ + | sort | uniq > ${packagesdir}/package_names_sid.$(date -I) LANG=C cat ${filesdir}/db/source_names_unstable.txt \ - | sort | uniq > ${packagesdir}/source_names_unstable.$(date -I) + | sort | uniq > ${packagesdir}/source_names_sid.$(date -I) cd $topdir -./bin/newpkg_info unstable +./bin/newpkg_info sid diff --git a/lib/Packages/Dispatcher.pm b/lib/Packages/Dispatcher.pm index 3dcab38..9d38c17 100755 --- a/lib/Packages/Dispatcher.pm +++ b/lib/Packages/Dispatcher.pm @@ -171,7 +171,11 @@ sub do_dispatch { my %SUITES_ALIAS = ( sarge => 'oldstable', etch => 'stable', lenny => 'testing', - sid => 'unstable', ); + sid => 'unstable', + oldstable => 'sarge', + stable => 'etch', + testing => 'lenny', + unstable => 'sid', ); my %SECTIONS = map { $_ => 1 } @SECTIONS; my %ARCHIVES = map { $_ => 1 } @ARCHIVES; my %ARCHITECTURES = map { $_ => 1 } (@ARCHITECTURES, 'all', 'any'); -- 2.39.2