From 7e7272c6ec4b778bac6c56d482ed21d932943cec Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Thu, 1 Feb 2018 11:52:56 +0000 Subject: [PATCH] Import patches-unapplied version 2.498 to ubuntu/bionic-proposed Imported using git-ubuntu import. Changelog parent: 8ea490e6a2a9d86e680d48d4e271613203710baf New changelog entries: * Don't write config/seeded-snaps if no snaps have been seeded. --- debian/changelog | 6 ++++++ live-build/auto/config | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index fa7dd6ba..f9d22bb6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.498) bionic; urgency=medium + + * Don't write config/seeded-snaps if no snaps have been seeded. + + -- Iain Lane Thu, 01 Feb 2018 11:52:56 +0000 + livecd-rootfs (2.497) bionic; urgency=medium * live-build/auto/config: Clean out unused hostname matches and fix indenting. diff --git a/live-build/auto/config b/live-build/auto/config index 3cc294e1..1e990087 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -676,7 +676,9 @@ if [ -n "${BASE_SEED}" ]; then ALL_SNAPS="${ALL_SNAPS:+${ALL_SNAPS} }${snap}" done done - echo "${ALL_SNAPS}" > config/seeded-snaps + if [ -n "${ALL_SNAPS}" ]; then + echo "${ALL_SNAPS}" > config/seeded-snaps + fi fi export APT_OPTIONS