From 8704aafecc33b2ed06a058d423e87740066119eb Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Wed, 17 May 2023 14:48:48 +1200 Subject: [PATCH] live-build/expand-task: handle seeding of classic snaps correctly. --- debian/changelog | 1 + live-build/expand-task | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d6f42966..fbd6c88d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ livecd-rootfs (2.838) UNRELEASED; urgency=medium Cross flavour task references do not work with the approach expand-task takes, and the ubuntu-desktop-minimal package is part of the edubuntu-desktop-gnome task already. + * live-build/expand-task: handle seeding of classic snaps correctly. -- Michael Hudson-Doyle Wed, 17 May 2023 13:24:43 +1200 diff --git a/live-build/expand-task b/live-build/expand-task index 7219089f..1ac44881 100755 --- a/live-build/expand-task +++ b/live-build/expand-task @@ -77,7 +77,10 @@ for seedtext in glob.glob(f'{args.output_dir}/*.seedtext'): for seed in getTaskSeeds(hs, seedname): for line in open(f'{args.output_dir}/{seed}{ext}'): if re.match('^[a-z0-9]', line): - print(line.split()[0]) + name = line.split()[0] + if args.what == 'snaps' and '(classic)' in line: + name += '/classic' + print(name) break else: raise Exception("did not find task %r" % (args.task,))