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
1=== modified file 'archive-reports'
2--- archive-reports 2021-11-01 20:07:30 +0000
3+++ archive-reports 2022-01-28 18:12:58 +0000
4@@ -25,7 +25,7 @@
5 GERMINATE="$HOME/mirror/ubuntu-germinate"
6 OUT="$HOME/public_html"
7 DEVEL=jammy
8-PROPOSED_MIGRATION_SERIES="trusty xenial bionic focal hirsute impish jammy"
9+PROPOSED_MIGRATION_SERIES="trusty xenial bionic focal impish jammy"
10
11 mtimes="$(mktemp -d)"
12
13
14=== modified file 'update-germinate'
15--- update-germinate 2021-11-01 20:07:30 +0000
16+++ update-germinate 2022-01-28 18:12:58 +0000
17@@ -16,12 +16,12 @@
18 esac
19 }
20
21-for dist in trusty xenial bionic focal hirsute impish jammy; do
22+for dist in trusty xenial bionic focal impish jammy; do
23 options_for_dist "$dist"
24 update-one-germinate "ubuntu.$dist" "$dist" main,restricted,universe,multiverse
25 done
26
27-for dist in trusty xenial bionic focal hirsute impish jammy; do
28+for dist in trusty xenial bionic focal impish jammy; do
29 options_for_dist "$dist"
30 update-one-germinate "kubuntu.$dist" "$dist" main,restricted,universe,multiverse
31 done
32@@ -31,12 +31,12 @@
33 update-one-germinate "edubuntu.$dist" "$dist" main,restricted,universe,multiverse
34 done
35
36-for dist in trusty xenial bionic focal hirsute impish jammy; do
37+for dist in trusty xenial bionic focal impish jammy; do
38 options_for_dist "$dist"
39 update-one-germinate "xubuntu.$dist" "$dist" main,restricted,universe,multiverse
40 done
41
42-for dist in trusty xenial bionic focal hirsute impish jammy; do
43+for dist in trusty xenial bionic focal impish jammy; do
44 options_for_dist "$dist"
45 update-one-germinate "ubuntustudio.$dist" "$dist" main,restricted,universe,multiverse
46 done
47@@ -51,7 +51,7 @@
48 update-one-germinate "kubuntu-active.$dist" "$dist" main,restricted,universe,multiverse
49 done
50
51-for dist in trusty xenial bionic focal hirsute impish jammy; do
52+for dist in trusty xenial bionic focal impish jammy; do
53 options_for_dist "$dist"
54 update-one-germinate "lubuntu.$dist" "$dist" main,restricted,universe,multiverse
55 done
56@@ -66,22 +66,22 @@
57 update-one-germinate "ubuntu-touch.$dist" "$dist" main,restricted,universe,multiverse
58 done
59
60-for dist in xenial bionic focal hirsute impish jammy; do
61+for dist in xenial bionic focal impish jammy; do
62 options_for_dist "$dist"
63 update-one-germinate "ubuntukylin.$dist" "$dist" main,restricted,universe,multiverse
64 done
65
66-for dist in xenial bionic focal hirsute impish jammy; do
67+for dist in xenial bionic focal impish jammy; do
68 options_for_dist "$dist"
69 update-one-germinate "ubuntu-mate.$dist" "$dist" main,restricted,universe,multiverse
70 done
71
72-for dist in bionic focal hirsute impish jammy; do
73+for dist in bionic focal impish jammy; do
74 options_for_dist "$dist"
75 update-one-germinate "ubuntu-budgie.$dist" "$dist" main,restricted,universe,multiverse
76 done
77
78-for dist in focal hirsute impish jammy; do
79+for dist in focal impish jammy; do
80 GERMINATE_OPTIONS="-a i386" \
81 update-one-germinate "i386.$dist" "$dist" main,restricted,universe,multiverse
82 done
83
84=== modified file 'update-seeds'
85--- update-seeds 2021-11-01 20:07:30 +0000
86+++ update-seeds 2022-01-28 18:12:58 +0000
87@@ -9,22 +9,22 @@
88
89 ONLY_SERIES="$1"
90
91-for dist in platform.{trusty,xenial,bionic,focal,hirsute,impish,jammy} \
92- ubuntu.{trusty,xenial,bionic,focal,hirsute,impish,jammy} \
93- kubuntu.{trusty,xenial,bionic,focal,hirsute,impish,jammy} \
94+for dist in platform.{trusty,xenial,bionic,focal,impish,jammy} \
95+ ubuntu.{trusty,xenial,bionic,focal,impish,jammy} \
96+ kubuntu.{trusty,xenial,bionic,focal,impish,jammy} \
97 kubuntu-active.trusty \
98 edubuntu.{trusty,xenial} \
99- xubuntu.{trusty,xenial,bionic,focal,hirsute,impish,jammy} \
100- i386.{focal,hirsute,impish,jammy} \
101+ xubuntu.{trusty,xenial,bionic,focal,impish,jammy} \
102+ i386.{focal,impish,jammy} \
103 mythbuntu.{trusty,xenial} \
104- ubuntustudio.{trusty,xenial,bionic,focal,hirsute,impish,jammy} \
105- lubuntu.{trusty,xenial,bionic,focal,hirsute,impish,jammy} \
106+ ubuntustudio.{trusty,xenial,bionic,focal,impish,jammy} \
107+ lubuntu.{trusty,xenial,bionic,focal,impish,jammy} \
108 ubuntu-gnome.xenial \
109 ubuntu-touch.{trusty,xenial} \
110- ubuntukylin.{trusty,xenial,bionic,focal,hirsute,impish,jammy} \
111- ubuntu-core.{xenial,bionic,focal,hirsute,impish,jammy} \
112- ubuntu-mate.{xenial,bionic,focal,hirsute,impish,jammy} \
113- ubuntu-budgie.{bionic,focal,hirsute,impish,jammy}; do
114+ ubuntukylin.{trusty,xenial,bionic,focal,impish,jammy} \
115+ ubuntu-core.{xenial,bionic,focal,impish,jammy} \
116+ ubuntu-mate.{xenial,bionic,focal,impish,jammy} \
117+ ubuntu-budgie.{bionic,focal,impish,jammy}; do
118 if [ "$ONLY_SERIES" ]; then
119 case $dist in
120 *.$ONLY_SERIES)

Subscribers

People subscribed via source and target branches