From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 16 Aug 2018 08:07:17 +0000 (+0200)
Subject: setup-all-dchroots: move DPKGARCH to where it's used
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=49f7c90c52341e0a0666e578f6ca09c7d2d5d55b;hp=48dbf6b29a7089c34a32f3fd812510af7d8312d9;p=mirror%2Fdsa-puppet.git

setup-all-dchroots: move DPKGARCH to where it's used
---

diff --git a/modules/schroot/files/setup-all-dchroots b/modules/schroot/files/setup-all-dchroots
index a5e609422..7ff84b40c 100755
--- a/modules/schroot/files/setup-all-dchroots
+++ b/modules/schroot/files/setup-all-dchroots
@@ -28,8 +28,6 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 # OTHER DEALINGS IN THE SOFTWARE.
 
-DPKGARCH=$(dpkg --print-architecture)
-
 get_suites() {
     case "$1" in
       amd64|i386|armel|armhf)
@@ -131,10 +129,10 @@ else
     SILENT="chronic"
 fi
 
-
-# get list of archs based on DPKGARCH
+# get list of archs based on dpkg architecture
 ##########
-archs="$DPKGARCH"
+DPKGARCH=$(dpkg --print-architecture)
+archs="DPKGARCH"
 case "$DPKGARCH" in
     amd64)
         archs="$archs i386"