Merge lp:~brian-murray/ubuntu-archive-scripts/hasta-la-vista-hirsute into lp:ubuntu-archive-scripts

Proposed by Brian Murray
Status: Merged
Merged at revision: 321
Proposed branch: lp:~brian-murray/ubuntu-archive-scripts/hasta-la-vista-hirsute
Merge into: lp:ubuntu-archive-scripts
Diff against target: 120 lines (+21/-21)
3 files modified
archive-reports (+1/-1)
update-germinate (+9/-9)
update-seeds (+11/-11)
To merge this branch: bzr merge lp:~brian-murray/ubuntu-archive-scripts/hasta-la-vista-hirsute
Reviewer Review Type Date Requested Status
Steve Langasek Approve
Review via email: mp+414753@code.launchpad.net

Description of the change

Also add hirsute to the exclusion list in the archive-reports rsync, to stop it being mirrored from ftpmaster. (I think that's something I cannot do.)

To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'archive-reports'
--- archive-reports 2021-11-01 20:07:30 +0000
+++ archive-reports 2022-01-28 18:12:58 +0000
@@ -25,7 +25,7 @@
25GERMINATE="$HOME/mirror/ubuntu-germinate"25GERMINATE="$HOME/mirror/ubuntu-germinate"
26OUT="$HOME/public_html"26OUT="$HOME/public_html"
27DEVEL=jammy27DEVEL=jammy
28PROPOSED_MIGRATION_SERIES="trusty xenial bionic focal hirsute impish jammy"28PROPOSED_MIGRATION_SERIES="trusty xenial bionic focal impish jammy"
2929
30mtimes="$(mktemp -d)"30mtimes="$(mktemp -d)"
3131
3232
=== modified file 'update-germinate'
--- update-germinate 2021-11-01 20:07:30 +0000
+++ update-germinate 2022-01-28 18:12:58 +0000
@@ -16,12 +16,12 @@
16 esac16 esac
17}17}
1818
19for dist in trusty xenial bionic focal hirsute impish jammy; do19for dist in trusty xenial bionic focal impish jammy; do
20 options_for_dist "$dist"20 options_for_dist "$dist"
21 update-one-germinate "ubuntu.$dist" "$dist" main,restricted,universe,multiverse21 update-one-germinate "ubuntu.$dist" "$dist" main,restricted,universe,multiverse
22done22done
2323
24for dist in trusty xenial bionic focal hirsute impish jammy; do24for dist in trusty xenial bionic focal impish jammy; do
25 options_for_dist "$dist"25 options_for_dist "$dist"
26 update-one-germinate "kubuntu.$dist" "$dist" main,restricted,universe,multiverse26 update-one-germinate "kubuntu.$dist" "$dist" main,restricted,universe,multiverse
27done27done
@@ -31,12 +31,12 @@
31 update-one-germinate "edubuntu.$dist" "$dist" main,restricted,universe,multiverse31 update-one-germinate "edubuntu.$dist" "$dist" main,restricted,universe,multiverse
32done32done
3333
34for dist in trusty xenial bionic focal hirsute impish jammy; do34for dist in trusty xenial bionic focal impish jammy; do
35 options_for_dist "$dist"35 options_for_dist "$dist"
36 update-one-germinate "xubuntu.$dist" "$dist" main,restricted,universe,multiverse36 update-one-germinate "xubuntu.$dist" "$dist" main,restricted,universe,multiverse
37done37done
3838
39for dist in trusty xenial bionic focal hirsute impish jammy; do39for dist in trusty xenial bionic focal impish jammy; do
40 options_for_dist "$dist"40 options_for_dist "$dist"
41 update-one-germinate "ubuntustudio.$dist" "$dist" main,restricted,universe,multiverse41 update-one-germinate "ubuntustudio.$dist" "$dist" main,restricted,universe,multiverse
42done42done
@@ -51,7 +51,7 @@
51 update-one-germinate "kubuntu-active.$dist" "$dist" main,restricted,universe,multiverse51 update-one-germinate "kubuntu-active.$dist" "$dist" main,restricted,universe,multiverse
52done52done
5353
54for dist in trusty xenial bionic focal hirsute impish jammy; do54for dist in trusty xenial bionic focal impish jammy; do
55 options_for_dist "$dist"55 options_for_dist "$dist"
56 update-one-germinate "lubuntu.$dist" "$dist" main,restricted,universe,multiverse56 update-one-germinate "lubuntu.$dist" "$dist" main,restricted,universe,multiverse
57done57done
@@ -66,22 +66,22 @@
66 update-one-germinate "ubuntu-touch.$dist" "$dist" main,restricted,universe,multiverse66 update-one-germinate "ubuntu-touch.$dist" "$dist" main,restricted,universe,multiverse
67done67done
6868
69for dist in xenial bionic focal hirsute impish jammy; do69for dist in xenial bionic focal impish jammy; do
70 options_for_dist "$dist"70 options_for_dist "$dist"
71 update-one-germinate "ubuntukylin.$dist" "$dist" main,restricted,universe,multiverse71 update-one-germinate "ubuntukylin.$dist" "$dist" main,restricted,universe,multiverse
72done72done
7373
74for dist in xenial bionic focal hirsute impish jammy; do74for dist in xenial bionic focal impish jammy; do
75 options_for_dist "$dist"75 options_for_dist "$dist"
76 update-one-germinate "ubuntu-mate.$dist" "$dist" main,restricted,universe,multiverse76 update-one-germinate "ubuntu-mate.$dist" "$dist" main,restricted,universe,multiverse
77done77done
7878
79for dist in bionic focal hirsute impish jammy; do79for dist in bionic focal impish jammy; do
80 options_for_dist "$dist"80 options_for_dist "$dist"
81 update-one-germinate "ubuntu-budgie.$dist" "$dist" main,restricted,universe,multiverse81 update-one-germinate "ubuntu-budgie.$dist" "$dist" main,restricted,universe,multiverse
82done82done
8383
84for dist in focal hirsute impish jammy; do84for dist in focal impish jammy; do
85 GERMINATE_OPTIONS="-a i386" \85 GERMINATE_OPTIONS="-a i386" \
86 update-one-germinate "i386.$dist" "$dist" main,restricted,universe,multiverse86 update-one-germinate "i386.$dist" "$dist" main,restricted,universe,multiverse
87done87done
8888
=== modified file 'update-seeds'
--- update-seeds 2021-11-01 20:07:30 +0000
+++ update-seeds 2022-01-28 18:12:58 +0000
@@ -9,22 +9,22 @@
99
10ONLY_SERIES="$1"10ONLY_SERIES="$1"
1111
12for dist in platform.{trusty,xenial,bionic,focal,hirsute,impish,jammy} \12for dist in platform.{trusty,xenial,bionic,focal,impish,jammy} \
13 ubuntu.{trusty,xenial,bionic,focal,hirsute,impish,jammy} \13 ubuntu.{trusty,xenial,bionic,focal,impish,jammy} \
14 kubuntu.{trusty,xenial,bionic,focal,hirsute,impish,jammy} \14 kubuntu.{trusty,xenial,bionic,focal,impish,jammy} \
15 kubuntu-active.trusty \15 kubuntu-active.trusty \
16 edubuntu.{trusty,xenial} \16 edubuntu.{trusty,xenial} \
17 xubuntu.{trusty,xenial,bionic,focal,hirsute,impish,jammy} \17 xubuntu.{trusty,xenial,bionic,focal,impish,jammy} \
18 i386.{focal,hirsute,impish,jammy} \18 i386.{focal,impish,jammy} \
19 mythbuntu.{trusty,xenial} \19 mythbuntu.{trusty,xenial} \
20 ubuntustudio.{trusty,xenial,bionic,focal,hirsute,impish,jammy} \20 ubuntustudio.{trusty,xenial,bionic,focal,impish,jammy} \
21 lubuntu.{trusty,xenial,bionic,focal,hirsute,impish,jammy} \21 lubuntu.{trusty,xenial,bionic,focal,impish,jammy} \
22 ubuntu-gnome.xenial \22 ubuntu-gnome.xenial \
23 ubuntu-touch.{trusty,xenial} \23 ubuntu-touch.{trusty,xenial} \
24 ubuntukylin.{trusty,xenial,bionic,focal,hirsute,impish,jammy} \24 ubuntukylin.{trusty,xenial,bionic,focal,impish,jammy} \
25 ubuntu-core.{xenial,bionic,focal,hirsute,impish,jammy} \25 ubuntu-core.{xenial,bionic,focal,impish,jammy} \
26 ubuntu-mate.{xenial,bionic,focal,hirsute,impish,jammy} \26 ubuntu-mate.{xenial,bionic,focal,impish,jammy} \
27 ubuntu-budgie.{bionic,focal,hirsute,impish,jammy}; do27 ubuntu-budgie.{bionic,focal,impish,jammy}; do
28 if [ "$ONLY_SERIES" ]; then28 if [ "$ONLY_SERIES" ]; then
29 case $dist in29 case $dist in
30 *.$ONLY_SERIES)30 *.$ONLY_SERIES)

Subscribers

People subscribed via source and target branches