From b91452e7feb30791e633d023dcefb64f4da1c439 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Mon, 28 Aug 2023 14:02:51 +1200 Subject: [PATCH] snap-seed-parse.py: fix builds with no snaps. --- debian/changelog | 6 ++++++ live-build/snap-seed-parse.py | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index cba04b5f..30105f58 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (23.10.25) UNRELEASED; urgency=medium + + * snap-seed-parse.py: fix builds with no snaps. + + -- Michael Hudson-Doyle Mon, 28 Aug 2023 14:02:08 +1200 + livecd-rootfs (23.10.24) mantic; urgency=medium * update-source-catalog: Fix case where a variaton does not point at the diff --git a/live-build/snap-seed-parse.py b/live-build/snap-seed-parse.py index 058a3d2c..c8ea8b4f 100755 --- a/live-build/snap-seed-parse.py +++ b/live-build/snap-seed-parse.py @@ -65,6 +65,10 @@ def make_manifest_from_seed_yaml(path): def look_for_uc20_model(chroot): + systems_dir = f"{chroot}/var/lib/snapd/seed/systems" + if not os.path.isdir(systems_dir): + log("no systems directory found") + return None modeenv = f"{chroot}/var/lib/snapd/modeenv" system_name = None if os.path.isfile(modeenv): @@ -76,7 +80,7 @@ def look_for_uc20_model(chroot): log(f"read system name {system_name!r} from modeenv") break if system_name is None: - system_names = os.listdir(f"{chroot}/var/lib/snapd/seed/systems") + system_names = os.listdir(systems_dir) if len(system_names) == 0: log("no systems found") return None