Merge lp:~vorlon/ubuntu-archive-tools/sru-release-esm into lp:ubuntu-archive-tools

[Steve Langasek]

[lp:~vorlon/ubuntu-archive-tools/sru-release-esm]

1101. By Steve Langasek on 2017-05-16

Add an esm option to avoid hard-coding precise in the code, per Adam's feedback

[Adam Conrad (adconrad)]

LGTM. As mentioned on IRC, maybe we could clean up the UI a bit to actually differentiate between primary pockets and ESM PPAs when displaying source and target versions, but UI isn't ubuntu-archive-tools' strong suit.

If this isn't yet tested, I'd recommend twiddling archive names and doing some test runs to verify it works how you think it does, but +1 from me.

review: Approve

[Steve Langasek (vorlon)]

> If this isn't yet tested, I'd recommend twiddling archive names and doing some
> test runs to verify it works how you think it does, but +1 from me.

I verified sane output with --no-act for the ESM case, and verified that the script still works for the non-ESM case, so I consider that tested.

=== modified file 'sru-release'
--- sru-release	2017-05-03 10:49:03 +0000
+++ sru-release	2017-05-16 21:06:02 +0000
@@ -99,22 +99,32 @@
       'published': proposed_date}
     '''
     versions = defaultdict(dict)
-    matches = archive.getPublishedSources(
+    if options.esm:
+        pocket = 'Release'
+    else:
+        pocket = 'Proposed'
+
+    matches = src_archive.getPublishedSources(
         source_name=sourcename, exact_match=not options.pattern,
-        status='Published', pocket='Proposed', distro_series=series)
+        status='Published', pocket=pocket, distro_series=series)
     for match in matches:
         # versions in all pockets
-        for pub in archive.getPublishedSources(
+        for pub in src_archive.getPublishedSources(
                 source_name=match.source_package_name, exact_match=True,
                 status='Published', distro_series=series):
-            versions[pub.source_package_name][pub.pocket.lower()] = (
+            key = pub.pocket.lower()
+            # special case for ESM ppas, which don't have pockets but need
+            # to be treated as -proposed
+            if options.esm and key == 'release':
+                key = 'proposed'
+            versions[pub.source_package_name][key] = (
                 pub.source_package_version)
-            if 'Proposed' in pub.pocket:
+            if pocket in pub.pocket:
                 versions[pub.source_package_name]['changesfile'] = (
                     pub.changesFileUrl())
         # devel version
         if devel_series:
-            for pub in archive.getPublishedSources(
+            for pub in src_archive.getPublishedSources(
                     source_name=match.source_package_name, exact_match=True,
                     status='Published', distro_series=devel_series):
                 if pub.pocket in ('Release', 'Proposed'):
@@ -148,8 +158,9 @@
             print('Devel:    %s' % versions['devel'])
 
         copy = partial(
-            archive.copyPackage, from_archive=archive, include_binaries=True,
-            source_name=pkg, version=versions['proposed'], auto_approve=True)
+            dst_archive.copyPackage, from_archive=src_archive,
+            include_binaries=True, source_name=pkg,
+            version=versions['proposed'], auto_approve=True)
 
         if options.devel:
             if ('devel' not in versions or
@@ -233,6 +244,9 @@
     parser.add_option(
         '--exclude-bug', action='append', default=[], metavar='BUG',
         help='Do not update BUG.')
+    parser.add_option(
+        '-E', '--esm', action='store_true', default=False,
+        help='Copy from the kernel ESM proposed PPA to the ESM publication PPA')
 
     options, args = parser.parse_args()
 
@@ -255,7 +269,19 @@
         sys.stderr.write(
             'WARNING: No current development series, -d will not work\n')
         devel_series = None
-    archive = ubuntu.getArchive(name='primary')
+    if release == 'precise':
+        sys.stdout.write(
+            'Called for precise; assuming kernel ESM publication\n')
+        options.esm = True
+
+    if options.esm:
+        options.release = True
+        src_archive = launchpad.archives.getByReference(
+            reference='~canonical-kernel-esm/ubuntu/proposed')
+        dst_archive = launchpad.archives.getByReference(
+            reference='~ubuntu-esm/ubuntu/esm')
+    else:
+        src_archive = dst_archive = ubuntu.getArchive(name='primary')
 
     for package in packages:
         release_package(options, package)