From f04a535b0c152c109ec54a633176f4421c4e9cf3 Mon Sep 17 00:00:00 2001
From: Steve Langasek <steve.langasek@canonical.com>
Date: Tue, 7 Feb 2017 08:57:50 -0800
Subject: [PATCH] Always export LB_IMAGE_FLAVORS, so that hooks don't complain
 about unbound variables

---
 live-build/auto/config | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/live-build/auto/config b/live-build/auto/config
index 5ef9549f..7533ac01 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -618,9 +618,7 @@ lb config noauto \
 echo "LB_CHROOT_HOOKS=\"$CHROOT_HOOKS\"" >> config/chroot
 echo "LB_BINARY_HOOKS=\"$BINARY_HOOKS\"" >> config/binary
 echo "BUILDSTAMP=\"$NOW\"" >> config/binary
-if [ -n "$IMAGE_FLAVORS" ]; then
-	echo "LB_IMAGE_FLAVORS=\"$IMAGE_FLAVORS\"" >> config/binary
-fi
+echo "LB_IMAGE_FLAVORS=\"$IMAGE_FLAVORS\"" >> config/binary
 
 case $ARCH+$SUBARCH in
 	armhf+raspi2)