[pbuilder] 01/01: modules: if ARCHITECTURE is not set, finalize it and HOST_ARCH right after chroot extraction, using the native architecture of the chroot

[Mattia Rizzolo]

This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to branch master
in repository pbuilder.

commit 4f50108553b0aaeb4f7118e724c44e3c9e60a20b
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Sun Jan 15 18:03:53 2017 +0100

    modules: if ARCHITECTURE is not set, finalize it and HOST_ARCH right after chroot extraction, using the native architecture of the chroot
    
    It's an ugly place, but there is hardly any better
    
    Thanks: James Clarke <jrtc27 at jrtc27.com> for initially noticing this could be unset in some contexts
---
 pbuilder-checkparams | 3 ---
 pbuilder-modules     | 4 ++++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pbuilder-checkparams b/pbuilder-checkparams
index fd4c4a4..752a7de 100755
--- a/pbuilder-checkparams
+++ b/pbuilder-checkparams
@@ -350,9 +350,6 @@ log.d "cmdline: ${PBUILDER_OPERATION} ${CMDLINE}"
 
 BUILDPLACE=${BUILDPLACE?"Build root directory is not defined"}
 
-# if HOST_ARCH is not defined at this point, we are doing a native build
-HOST_ARCH=${HOST_ARCH:-${ARCHITECTURE}}
-
 # the default is to add a PID in the buildplace specified in the config file.
 BASEBUILDPLACE="$BUILDPLACE"
 if [ "${INTERNAL_BUILD_UML}" != "yes" -a "${PRESERVE_BUILDPLACE}" != "yes" ]; then
diff --git a/pbuilder-modules b/pbuilder-modules
index cf88f0c..81da639 100644
--- a/pbuilder-modules
+++ b/pbuilder-modules
@@ -662,6 +662,10 @@ function extractbuildplace () {
         fi
     fi
 
+    # finalize ARCHITECTURE and HOST_ARCH if those aren't set
+    ARCHITECTURE="${ARCHITECTURE:-"$($CHROOTEXEC dpkg-architecture -qDEB_BUILD_ARCH)"}"
+    HOST_ARCH="${HOST_ARCH:-"${ARCHITECTURE}"}"
+
     executehooks "H"
 }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pbuilder/pbuilder.git