Merge lp:~vorlon/ubuntu-archive-scripts/i386-for-historic-series into lp:ubuntu-archive-scripts

[Steve Langasek]

Continue germinating with i386 for already-released series. Assumes https://code.launchpad.net/~xnox/germinate/+git/germinate/+merge/374917 will land and switch the default to amd64 going forward.

Code cleans itself up as the older releases fall off.

[lp:~vorlon/ubuntu-archive-scripts/i386-for-historic-series]

262. By Steve Langasek on 2019-11-11

Restore accidentally-nuked export statement

[Adam Conrad (adconrad)]

This looks reasonable. Normally, I'd suggest that we should always be explicit (and, thus, also set it to amd64 in the * case) to guard against defaults changing, but given that we have tight control over what happens to germinate and Colin isn't going to change it willy-nilly, the simplicity and self-cleaning of this works for me.

review: Approve

=== modified file 'update-germinate'
--- update-germinate	2019-10-25 15:24:51 +0000
+++ update-germinate	2019-11-11 20:22:09 +0000
@@ -4,54 +4,76 @@
 
 (cd "$HOME/germinate" && git pull -q)
 
+export GERMINATE_OPTIONS
+options_for_dist() {
+	case $1 in
+		precise|trusty|xenial|bionic|disco|eoan)
+			GERMINATE_OPTIONS="-a i386"
+			;;
+	esac
+}
+
 for dist in precise trusty xenial bionic disco eoan focal; do
+	options_for_dist "$dist"
 	update-one-germinate "ubuntu.$dist" "$dist" main,restricted,universe,multiverse
 done
 
 for dist in precise trusty xenial bionic disco eoan focal; do
+	options_for_dist "$dist"
 	update-one-germinate "kubuntu.$dist" "$dist" main,restricted,universe,multiverse
 done
 
 for dist in precise trusty xenial; do
+	options_for_dist "$dist"
 	update-one-germinate "edubuntu.$dist" "$dist" main,restricted,universe,multiverse
 done
 
 for dist in precise trusty xenial bionic disco eoan focal; do
+	options_for_dist "$dist"
 	update-one-germinate "xubuntu.$dist" "$dist" main,restricted,universe,multiverse
 done
 
 for dist in precise trusty xenial bionic disco eoan focal; do
+	options_for_dist "$dist"
 	update-one-germinate "ubuntustudio.$dist" "$dist" main,restricted,universe,multiverse
 done
 
 for dist in precise trusty xenial; do
+	options_for_dist "$dist"
 	update-one-germinate "mythbuntu.$dist" "$dist" main,restricted,universe,multiverse
 done
 
 for dist in precise trusty; do
+	options_for_dist "$dist"
 	update-one-germinate "kubuntu-active.$dist" "$dist" main,restricted,universe,multiverse
 done
 
 for dist in precise trusty xenial bionic disco eoan focal; do
+	options_for_dist "$dist"
 	update-one-germinate "lubuntu.$dist" "$dist" main,restricted,universe,multiverse
 done
 
 for dist in trusty xenial; do
+	options_for_dist "$dist"
 	update-one-germinate "ubuntu-gnome.$dist" "$dist" main,restricted,universe,multiverse
 done
 
 for dist in trusty xenial; do
+	options_for_dist "$dist"
 	update-one-germinate "ubuntu-touch.$dist" "$dist" main,restricted,universe,multiverse
 done
 
 for dist in xenial bionic disco eoan focal; do
+	options_for_dist "$dist"
 	update-one-germinate "ubuntukylin.$dist" "$dist" main,restricted,universe,multiverse
 done
 
 for dist in xenial bionic disco eoan focal; do
+	options_for_dist "$dist"
 	update-one-germinate "ubuntu-mate.$dist" "$dist" main,restricted,universe,multiverse
 done
 
 for dist in bionic disco eoan focal; do
+	options_for_dist "$dist"
 	update-one-germinate "ubuntu-budgie.$dist" "$dist" main,restricted,universe,multiverse
 done