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

update-source-catalog: work better when we want a variation to point at the base layer.

Browse Source
This commit is contained in:
Michael Hudson-Doyle 2023-08-25 15:15:02 +12:00
parent 5456e4e5e6
commit 9b75387648
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -1,6 +1,8 @@
livecd-rootfs (23.10.22) UNRELEASED; urgency=medium livecd-rootfs (23.10.22) UNRELEASED; urgency=medium
* Undo preseeding in reset_snapd_state. * Undo preseeding in reset_snapd_state.
* update-source-catalog: work better when we want a variation to point
at the base layer.
-- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Fri, 25 Aug 2023 11:44:57 +1200 -- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Fri, 25 Aug 2023 11:44:57 +1200

8
update-source-catalog
View File

@ -37,12 +37,18 @@ for entry in output:
if 'variations' not in template: if 'variations' not in template:
print("Non unique id in source catalog but no variations!") print("Non unique id in source catalog but no variations!")
sys.exit(1) sys.exit(1)
for k, variation in template['variations'].items(): for variation in template['variations'].values():
variation['size'] = int(opts.size) variation['size'] = int(opts.size)
entry.setdefault('variations', {}).update(template['variations']) entry.setdefault('variations', {}).update(template['variations'])
break break
else: else:
# No entry with this id found, so add a new one. # No entry with this id found, so add a new one.
if template['variations']:
for variation in template['variations'].values():
if variation['path'] == opts.squashfs:
variation['size'] == int(opts.size)
template['size'] = int(opts.size) template['size'] = int(opts.size)
template['path'] = opts.squashfs template['path'] = opts.squashfs