From 959011d5fcf611b78742d1a65d8b581277a46a4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?=
 <lukasz.zemczak@canonical.com>
Date: Wed, 5 Apr 2023 22:29:40 +0200
Subject: [PATCH] Some fixes per review - thanks Dan!

---
 live-build/auto/config | 5 +++--
 update-source-catalog  | 4 +---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/live-build/auto/config b/live-build/auto/config
index b582e3c2..a0a76838 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -756,6 +756,7 @@ case $PROJECT in
 				# the enhanced-secureboot layer, contains all packages for the enhanced secureboot install
 				add_package minimal.standard.enhanced-secureboot cryptsetup
 				# now let's create the neccessary catalog files
+				# TODO: make sure that we handle locale_support: langpack correctly
 				cat <<-EOF > config/minimal.catalog-in.yaml
 					name: "Ubuntu Desktop (minimized)"
 					description: >-
@@ -763,7 +764,7 @@ case $PROJECT in
 					id: ubuntu-desktop-minimal
 					type: fsimage-layered
 					variant: desktop
-					locale_support: langpack
+					locale_support: none
 				EOF
 				cat <<-EOF > config/minimal.standard.catalog-in.yaml
 					name: "Ubuntu Desktop"
@@ -772,7 +773,7 @@ case $PROJECT in
 					id: ubuntu-desktop
 					type: fsimage-layered
 					variant: desktop
-					locale_support: langpack
+					locale_support: none
 					default: yes
 				EOF
 				cat <<-EOF > config/minimal.standard.classic.catalog-in.yaml
diff --git a/update-source-catalog b/update-source-catalog
index f2177844..0869dd39 100755
--- a/update-source-catalog
+++ b/update-source-catalog
@@ -37,11 +37,9 @@ for entry in output:
         if 'variations' not in template:
             print("Non unique id in source catalog but no variations!")
             sys.exit(1)
-        if 'variations' not in entry:
-            entry['variations'] = {}
         for k, variation in template['variations'].items():
             variation['size'] = int(opts.size)
-        entry['variations'].update(template['variations'])
+        entry.setdefault('variations', {}).update(template['variations'])
         break
 else:
     # No entry with this id found, so add a new one.