Merge ubuntu-archive-tools:drop-obsolete-series-references into ubuntu-archive-tools:main

Proposed by Steve Langasek
Status: Needs review
Proposed branch: ubuntu-archive-tools:drop-obsolete-series-references
Merge into: ubuntu-archive-tools:main
Diff against target: 54 lines (+7/-11)
3 files modified
checkrdepends (+5/-9)
package-subscribers (+1/-1)
sru-release (+1/-1)
Reviewer Review Type Date Requested Status
Brian Murray Pending
Ubuntu Package Archive Administrators Pending
Review via email: mp+438721@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) wrote :

Brian, requesting your review here specifically for the changes to package-subscribers, because there's a comment that "very few lucid packages are supported" but the following code listed lucid, precise, and trusty; so I wasn't clear if this list should be updated to match the current set of ESM archs (i.e.: add xenial)

Revision history for this message
Steve Langasek (vorlon) wrote :

@Brian ping

Revision history for this message
Brian Murray (brian-murray) wrote :

The package subscriber changes are no longer relevant because the code is currently:

 97 for series in ubuntu.series:
 98 # Releases in ESM have their own team responsible
 99 if series.name in ('trusty', 'xenial', 'bionic'):
100 continue

Unmerged commits

22a3fda... by Steve Langasek

Drop stale references to obsolete series

Don't carry code forever to support obsolete series that no longer exist in
the archive.

Also, update references to the set of series that are in ESM.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/checkrdepends b/checkrdepends
2index 6813d26..7b874cb 100755
3--- a/checkrdepends
4+++ b/checkrdepends
5@@ -50,18 +50,14 @@ def primary_arches(suite):
6
7
8 def ports_arches(suite):
9- if suite == 'lucid':
10- return ('armel', 'ia64', 'powerpc', 'sparc')
11- elif suite == 'precise':
12- return ('armel', 'armhf', 'powerpc')
13- elif suite in ('14.09', '14.09-factory'):
14- return ('armhf',)
15- elif suite in ('trusty', 'vivid', 'wily'):
16+ elif suite == 'trusty':
17 return ('arm64', 'armhf', 'powerpc', 'ppc64el')
18- elif suite in ('xenial', 'yakkety'):
19+ elif suite == 'xenial':
20 return ('arm64', 'armhf', 'powerpc', 'ppc64el', 's390x')
21- else:
22+ elif suite == 'bionic':
23 return ('arm64', 'armhf', 'ppc64el', 's390x')
24+ else:
25+ return ('arm64', 'armhf', 'ppc64el', 'riscv64', 's390x')
26
27
28 def read_sources(path):
29diff --git a/package-subscribers b/package-subscribers
30index 4925119..d0cf14d 100755
31--- a/package-subscribers
32+++ b/package-subscribers
33@@ -96,7 +96,7 @@ def main():
34 options.suites = []
35 for series in ubuntu.series:
36 # very few lucid packages are supported
37- if series.name in ('lucid', 'precise', 'trusty'):
38+ if series.name in ('trusty'):
39 continue
40 if series.active:
41 options.suites.append(series.name)
42diff --git a/sru-release b/sru-release
43index 47d0e2e..b9ba391 100755
44--- a/sru-release
45+++ b/sru-release
46@@ -507,7 +507,7 @@ if __name__ == '__main__':
47 'WARNING: {} not found in packages for kernel {}\n'.format(
48 package, ks_source.name))
49
50- if ks_source is None and release in ('precise', 'trusty'):
51+ if ks_source is None and release in ('trusty', 'xenial'):
52 sys.stdout.write(
53 'Called for {}; assuming kernel ESM publication\n'.format(release))
54 options.esm = True

Subscribers

People subscribed via source and target branches