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
diff --git a/checkrdepends b/checkrdepends
index 6813d26..7b874cb 100755
--- a/checkrdepends
+++ b/checkrdepends
@@ -50,18 +50,14 @@ def primary_arches(suite):
5050
5151
52def ports_arches(suite):52def ports_arches(suite):
53 if suite == 'lucid':53 elif suite == 'trusty':
54 return ('armel', 'ia64', 'powerpc', 'sparc')
55 elif suite == 'precise':
56 return ('armel', 'armhf', 'powerpc')
57 elif suite in ('14.09', '14.09-factory'):
58 return ('armhf',)
59 elif suite in ('trusty', 'vivid', 'wily'):
60 return ('arm64', 'armhf', 'powerpc', 'ppc64el')54 return ('arm64', 'armhf', 'powerpc', 'ppc64el')
61 elif suite in ('xenial', 'yakkety'):55 elif suite == 'xenial':
62 return ('arm64', 'armhf', 'powerpc', 'ppc64el', 's390x')56 return ('arm64', 'armhf', 'powerpc', 'ppc64el', 's390x')
63 else:57 elif suite == 'bionic':
64 return ('arm64', 'armhf', 'ppc64el', 's390x')58 return ('arm64', 'armhf', 'ppc64el', 's390x')
59 else:
60 return ('arm64', 'armhf', 'ppc64el', 'riscv64', 's390x')
6561
6662
67def read_sources(path):63def read_sources(path):
diff --git a/package-subscribers b/package-subscribers
index 4925119..d0cf14d 100755
--- a/package-subscribers
+++ b/package-subscribers
@@ -96,7 +96,7 @@ def main():
96 options.suites = []96 options.suites = []
97 for series in ubuntu.series:97 for series in ubuntu.series:
98 # very few lucid packages are supported98 # very few lucid packages are supported
99 if series.name in ('lucid', 'precise', 'trusty'):99 if series.name in ('trusty'):
100 continue100 continue
101 if series.active:101 if series.active:
102 options.suites.append(series.name)102 options.suites.append(series.name)
diff --git a/sru-release b/sru-release
index 47d0e2e..b9ba391 100755
--- a/sru-release
+++ b/sru-release
@@ -507,7 +507,7 @@ if __name__ == '__main__':
507 'WARNING: {} not found in packages for kernel {}\n'.format(507 'WARNING: {} not found in packages for kernel {}\n'.format(
508 package, ks_source.name))508 package, ks_source.name))
509509
510 if ks_source is None and release in ('precise', 'trusty'):510 if ks_source is None and release in ('trusty', 'xenial'):
511 sys.stdout.write(511 sys.stdout.write(
512 'Called for {}; assuming kernel ESM publication\n'.format(release))512 'Called for {}; assuming kernel ESM publication\n'.format(release))
513 options.esm = True513 options.esm = True

Subscribers

People subscribed via source and target branches