From 2dc48a16878576acd49bcd6904aca06b77b40b96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?=
 <lukasz.zemczak@canonical.com>
Date: Tue, 17 Aug 2021 12:02:39 +0200
Subject: [PATCH] Make the UBUNTU_STORE_ARCH adjustment more fool-proof

---
 live-build/functions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/live-build/functions b/live-build/functions
index 99e3bd5b..9b048c08 100644
--- a/live-build/functions
+++ b/live-build/functions
@@ -548,7 +548,7 @@ _snap_preseed() {
     sh -c "
         set -x;
         cd \"$CHROOT_ROOT/var/lib/snapd/seed\";
-        UBUNTU_STORE_ARCH=$ARCH SNAPPY_STORE_NO_CDN=1 snap download \
+        UBUNTU_STORE_ARCH=${ARCH:-} SNAPPY_STORE_NO_CDN=1 snap download \
             --cohort="${COHORT_KEY:-}" \
             --channel=\"$CHANNEL\" \"$SNAP_NAME\"" || snap_download_failed=1
     if [ $snap_download_failed = 1 ] ; then