Imported 2.737

No reason for CPC update specified.

debian/changelog

@@ -1,3 +1,10 @@
+livecd-rootfs (2.737) impish; urgency=medium
+
+  * Generate source catalogs for the desktop canary build.
+  * Check for duplicate ids in update-source-catalog.
+
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Tue, 14 Sep 2021 21:39:23 +1200
+
 livecd-rootfs (2.736) impish; urgency=medium
 
   * Change the per language layers in the desktop canary build to have more

live-build/auto/config

@@ -652,6 +652,25 @@ case $PROJECT in
 
 				derive_language_layers minimal desktop-minimal desktop-minimal-default-languages
 				derive_language_layers minimal.standard desktop desktop-default-languages
+				cat <<-EOF > config/minimal.catalog-in.yaml
+					name: "Ubuntu Desktop (minimized)"
+					description: >-
+					  A minimal but usable Ubuntu Desktop.
+					id: ubuntu-desktop-minimal
+					type: fsimage
+					variant: desktop
+				EOF
+				cat <<-EOF > config/minimal.standard.catalog-in.yaml
+					name: "Ubuntu Desktop"
+					description: >-
+					  A full featured Ubuntu Desktop.
+					id: ubuntu-desktop
+					type: fsimage
+					variant: desktop
+					default: yes
+				EOF
+				/usr/share/livecd-rootfs/checkout-translations-branch \
+					https://git.launchpad.net/subiquity po config/catalog-translations
 				;;
 
 			desktop-preinstalled)

update-source-catalog

@@ -51,15 +51,19 @@ for mo in glob.glob(os.path.join(opts.translations, '*.mo')):
 output.append(template)
 
 default_count = 0
+ids = set()
 for entry in output:
     if entry.get('default', False):
         default_count += 1
+    ids.add(entry['id'])
 
 
 if default_count > 1:
     print("Too many defaults in source catalog!")
     sys.exit(1)
 
+if len(ids) != len(output):
+    print("Non unique ids in %s!" % output)
 
 with open(opts.output, 'w') as fp:
     yaml.dump(output, fp)