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

Backport error-checking on determining snap bases

Browse Source 
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/livecd-rootfs/+bug/1828500

Signed-off-by: Iain Lane <iain.lane@canonical.com>
This commit is contained in:
Tobias Koch 2019-07-16 11:38:05 +01:00 committed by Iain Lane
parent f77a1b26cf
commit 51ef72e5b9
No known key found for this signature in database
GPG Key ID: E352D5C51C5041D4
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
livecd-rootfs (2.525.28) bionic; urgency=medium
[ Tobias Koch ]
* Do proper error checking when calling snap-tool info to determine
the base of a snap. (LP: #1828500)
-- Tobias Koch <tobias.koch@canonical.com> Tue, 16 Jul 2019 11:27:10 +0200
livecd-rootfs (2.525.27) bionic; urgency=medium
* Backport improvements to snap seeding from trunk. LP: #1831675.

14
live-build/functions
View File

@ -445,12 +445,20 @@ _snap_preseed() {
;;
*)
# Determine if and what core snap is needed
local core_snap=$(/usr/share/livecd-rootfs/snap-tool info \
local snap_info
snap_info=$(/usr/share/livecd-rootfs/snap-tool info \
--cohort-key="${COHORT_KEY:-}" \
--channel="$CHANNEL" "$SNAP_NAME" | \
grep '^base:' | awk '{print $2}'
--channel="$CHANNEL" "${SNAP_NAME}" \
)
if [ $? -ne 0 ]; then
echo "Failed to retrieve base of $SNAP_NAME!"
exit 1
fi
local core_snap=$(echo "$snap_info" | grep '^base:' | awk '{print $2}')
# If $core_snap is not the empty string then SNAP itself is not a core
# snap and we must additionally seed the core snap.
if [ -n "$core_snap" ]; then