From: Benjamin Drung <benjamin.drung@profitbricks.com>
Date: Thu, 9 Jan 2014 13:18:35 +0000 (+0100)
Subject: Rename pbuilder environment variable ARCH to ARCHITECTURE.
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=61b0de517a94ecf5d3d8319b19b486a5da0240f2;p=profitbricks%2Fjenkins-build-scripts.git

Rename pbuilder environment variable ARCH to ARCHITECTURE.

pbuilder falsely passes all environment variables into the chroot system.
The ARCH enviroment variable causes a build failure in the ethoip6 package.
---

diff --git a/.pbuilderrc b/.pbuilderrc
index 2567d7a..965db7b 100644
--- a/.pbuilderrc
+++ b/.pbuilderrc
@@ -43,16 +43,16 @@ esac
 
 
 
-: ${ARCH:="$(dpkg --print-architecture)"}
+: ${ARCHITECTURE:="$(dpkg --print-architecture)"}
 
 DEBOOTSTRAPOPTS=(
     '--variant=buildd'
 )
 
 NAME="$DIST"
-if [ -n "${ARCH}" ]; then
-    NAME="$NAME-$ARCH"
-    DEBOOTSTRAPOPTS=("--arch" "$ARCH" "${DEBOOTSTRAPOPTS[@]}")
+if [ -n "${ARCHITECTURE}" ]; then
+    NAME="$NAME-$ARCHITECTURE"
+    DEBOOTSTRAPOPTS=("--arch" "$ARCHITECTURE" "${DEBOOTSTRAPOPTS[@]}")
 fi
 
 #BUILDRESULT="/var/cache/pbuilder/$NAME/result/"
diff --git a/lib/pbuilder.py b/lib/pbuilder.py
index 70fa87d..c1a4f8d 100644
--- a/lib/pbuilder.py
+++ b/lib/pbuilder.py
@@ -36,7 +36,7 @@ class Pbuilder(object):
         '''
         result = os.environ
         result['DIST'] = self.dist
-        result['ARCH'] = self.arch
+        result['ARCHITECTURE'] = self.arch
         result['PB_SUITE'] = self.pb_suite
         result['GIT_COMMIT_ID'] = self.git_commit_id
         return result