From ed50ee0e0dbd0ec1df96826bed213ad7b5424a60 Mon Sep 17 00:00:00 2001
From: Daniel Watkins <daniel.watkins@canonical.com>
Date: Tue, 17 Apr 2018 17:35:10 -0400
Subject: [PATCH] Fix use of unbound variable

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

diff --git a/live-build/functions b/live-build/functions
index 7d368d99..484e5046 100644
--- a/live-build/functions
+++ b/live-build/functions
@@ -417,7 +417,7 @@ snap_prepare_assertions() {
     local CHROOT_ROOT=$1
     # Optional. If set, should be a colon-separated string of brand:model to be
     # used for the image's model assertion
-    local CUSTOM_BRAND_MODEL=$2
+    local CUSTOM_BRAND_MODEL=${2:-generic:generic-classic}
 
     local seed_dir="$CHROOT_ROOT/var/lib/snapd/seed"
     local snaps_dir="$seed_dir/snaps"
@@ -429,8 +429,6 @@ snap_prepare_assertions() {
     mkdir -p "$assertions_dir"
     mkdir -p "$snaps_dir"
 
-    local brand="generic"
-    local model="generic-classic"
     if [ -n "$CUSTOM_BRAND_MODEL" ] ; then
         brand="$(echo $CUSTOM_BRAND_MODEL | cut -d: -f 1)"
         model="$(echo $CUSTOM_BRAND_MODEL | cut -d: -f 2)"