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

Do not look for a base snap on snaps of type base, because recursive dependencies are not allowed for snaps. LP: #1957123.

Browse Source
This commit is contained in:
Steve Langasek 2022-01-11 16:26:57 -08:00
parent 3fba8bfff9
commit dc629f4114
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.664.37) UNRELEASED; urgency=medium
* Do not look for a base snap on snaps of type base, because recursive
dependencies are not allowed for snaps. LP: #1957123.
-- Steve Langasek <steve.langasek@ubuntu.com> Tue, 11 Jan 2022 15:38:05 -0800
livecd-rootfs (2.664.36) focal; urgency=medium livecd-rootfs (2.664.36) focal; urgency=medium
* live-build/ubuntu-server/hooks/032-installer-squashfs.binary: be more * live-build/ubuntu-server/hooks/032-installer-squashfs.binary: be more

12
live-build/functions
View File

@ -552,12 +552,16 @@ _snap_preseed() {
exit 1 exit 1
fi fi
local core_snap=$(echo "$snap_info" | grep '^base:' | awk '{print $2}') local snap_type=$(echo "$snap_info" | awk '/^type:/ { print $2 }')
# If snap info does not list a base use 'core' if [ "$snap_type" != base ]; then
core_snap=${core_snap:-core} local core_snap=$(echo "$snap_info" | grep '^base:' | awk '{print $2}')
_snap_preseed $CHROOT_ROOT $core_snap stable # If snap info does not list a base use 'core'
core_snap=${core_snap:-core}
_snap_preseed $CHROOT_ROOT $core_snap stable
fi
;; ;;
esac esac