Merge lp:~dbungert/ubuntu-cdimage/netinst-and-simplestreams into lp:ubuntu-cdimage

[Dan Bungert]

simplestreams: distinguish netinst iso from regular one

Fixes a simplestream related error when https://code.launchpad.net/~mwhudson/ubuntu-cdimage/netinst/ is applied.

[Steve Langasek (vorlon)]

Not ready to land and the source code is moving to git. Please resubmit there when ready.

review: Needs Resubmitting

Unmerged revisions

2079. By Dan Bungert on 2022-08-19

simplestreams: distinguish netinst iso from regular one

=== modified file 'lib/cdimage/simplestreams.py'
--- lib/cdimage/simplestreams.py	2021-10-21 14:17:18 +0000
+++ lib/cdimage/simplestreams.py	2022-08-19 16:58:00 +0000
@@ -141,6 +141,16 @@
             return series.realversion
         return match.group(1)
 
+    def generate_item_name(self, file, ftype):
+        """Return an item_name, based on filetype and filename.
+
+        In most cases the filetype is enough, but if there are multiple
+        files with the same extension we need to distinguish them.
+        """
+        if '-netinst-' in file:
+            return 'netinst-iso'
+        return ftype
+
     def scan_published_item(self, publishing_dir, sha256sums, file):
         """Scan and generate simplestream data for a published file."""
         for extension in ("iso", "img", "img.xz", "manifest", "list",
@@ -198,12 +208,13 @@
                 version_name = self.extract_release_identifier(file, series)
             else:
                 version_name = identifier
+            item_name = self.generate_item_name(file, data['ftype'])
             content_id = "%s:%s" % (self.content_id, item_project)
             product_name = '%s:%s:%s:%s' % (content_id, item_image_type,
                                             series.version, arch)
             self.cdimage_items.append(
                 (content_id, product_name, version_name,
-                 data['ftype'], data, ))
+                 item_name, data, ))
             self.prepare_product_info(product_name, item_project,
                                       series, item_image_type, arch)