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

Merge remote-tracking branch 'rcj/feature/snap_cohort_key-xenial' into ubuntu/xenial

Browse Source
This commit is contained in:
Brian Murray 2020-03-06 01:23:33 -08:00
commit 2738ffc1b3
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
livecd-rootfs (2.408.58) xenial; urgency=medium
* Use a snap cohort key for consistent parallel builds (LP: #1866159)
-- Robert C Jennings <robert.jennings@canonical.com> Fri, 21 Feb 2020 21:32:37 -0600
livecd-rootfs (2.408.57) xenial; urgency=medium livecd-rootfs (2.408.57) xenial; urgency=medium
* Preserve apt preferences created by any package we install (i.e. * Preserve apt preferences created by any package we install (i.e.

1
live-build/functions
View File

@ -367,6 +367,7 @@ _snap_preseed() {
set -x; set -x;
cd /var/lib/snapd/seed; cd /var/lib/snapd/seed;
SNAPPY_STORE_NO_CDN=1 snap download \ SNAPPY_STORE_NO_CDN=1 snap download \
--cohort="${COHORT_KEY:-}" \
--channel=$CHANNEL \"$SNAP_NAME\"" || snap_download_failed=1 --channel=$CHANNEL \"$SNAP_NAME\"" || snap_download_failed=1
if [ $snap_download_failed = 1 ] ; then if [ $snap_download_failed = 1 ] ; then
echo "If the channel ($CHANNEL) includes '*/ubuntu-##.##' track per " echo "If the channel ($CHANNEL) includes '*/ubuntu-##.##' track per "