Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-06-05 23:21:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

live-build/expand-task: handle seeding of classic snaps correctly.

Browse Source
This commit is contained in:
Michael Hudson-Doyle 2023-05-17 14:48:48 +12:00
parent 7c4fb6b804
commit 8704aafecc
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -8,6 +8,7 @@ livecd-rootfs (2.838) UNRELEASED; urgency=medium
Cross flavour task references do not work with the approach expand-task Cross flavour task references do not work with the approach expand-task
takes, and the ubuntu-desktop-minimal package is part of the takes, and the ubuntu-desktop-minimal package is part of the
edubuntu-desktop-gnome task already. edubuntu-desktop-gnome task already.
* live-build/expand-task: handle seeding of classic snaps correctly.
-- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Wed, 17 May 2023 13:24:43 +1200 -- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Wed, 17 May 2023 13:24:43 +1200

5
live-build/expand-task
View File

@ -77,7 +77,10 @@ for seedtext in glob.glob(f'{args.output_dir}/*.seedtext'):
for seed in getTaskSeeds(hs, seedname): for seed in getTaskSeeds(hs, seedname):
for line in open(f'{args.output_dir}/{seed}{ext}'): for line in open(f'{args.output_dir}/{seed}{ext}'):
if re.match('^[a-z0-9]', line): 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 break
else: else:
raise Exception("did not find task %r" % (args.task,)) raise Exception("did not find task %r" % (args.task,))