From 6673d4d6ee120d01b2e128aa0dfc63bdf40e7eb3 Mon Sep 17 00:00:00 2001 From: Adam Conrad Date: Mon, 23 Jul 2018 10:10:30 -0600 Subject: [PATCH] live-build/auto/config: Add nasty hack to order gtk-common-themese snap first in snapd's seed.yaml to work around the snapd bug in LP: #1772844 --- debian/changelog | 7 +++++++ live-build/auto/config | 7 ++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 1e97e3c3..42b93b9e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.525.3) bionic; urgency=medium + + * live-build/auto/config: Add nasty hack to order gtk-common-themese snap + first in snapd's seed.yaml to work around the snapd bug in LP: #1772844 + + -- Adam Conrad Mon, 23 Jul 2018 10:02:04 -0600 + livecd-rootfs (2.525.2) bionic; urgency=medium * Update unminimize script text and install ubuntu-standard when diff --git a/live-build/auto/config b/live-build/auto/config index e07aeb85..73baef97 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -700,7 +700,12 @@ if [ -n "${BASE_SEED}" ]; then seed_snaps=$(sed -rn '1,/-----/d;/-----/,$d; s/(.*) \|.*/\1/; s, \(classic\),/classic,; p' "${file}") for snap in ${seed_snaps}; do echo "snap: found ${snap}" - ALL_SNAPS="${ALL_SNAPS:+${ALL_SNAPS} }${snap}" + # Reorder gtk-common-themes first due to LP: #1772844 + if [ "${snap}" = "gtk-common-themes" ]; then + ALL_SNAPS="${snap}${ALL_SNAPS:+ ${ALL_SNAPS}}" + else + ALL_SNAPS="${ALL_SNAPS:+${ALL_SNAPS} }${snap}" + fi done done if [ -n "${ALL_SNAPS}" ] || [ -n "${HOOK_SNAPS}" ]; then