From 7741fc3c83fac691b2a42b5e519f680271afb3fb Mon Sep 17 00:00:00 2001
From: Frans Pop <fjp@debian.org>
Date: Mon, 18 Dec 2006 15:22:35 +0000
Subject: [PATCH] CONF.sh: don't determine ARCHES if already set; don't export
 CPU and KERNEL

---
 CONF.sh          | 30 ++++++++++++++++--------------
 debian/CONF.sh   | 30 ++++++++++++++++--------------
 debian/changelog |  8 +++++---
 3 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/CONF.sh b/CONF.sh
index e6cb15c2..7e33050b 100644
--- a/CONF.sh
+++ b/CONF.sh
@@ -53,7 +53,7 @@ export BASEDIR=`pwd`
 export CODENAME=etch
 
 # By default use Debian installer packages from $CODENAME
-if [ ! "$DI_CODENAME" ]; then
+if [ -z "$DI_CODENAME" ]; then
 	export DI_CODENAME=$CODENAME
 fi
 
@@ -74,20 +74,22 @@ export OFFICIAL="Unofficial"
 #export OFFICIAL="Official Beta"
 
 # ... for arch
-CPU=`dpkg-architecture -qDEB_HOST_DPKG_CPU 2>/dev/null || true`
-if [ "$CPU"x = ""x ] ; then
-    CPU=`dpkg-architecture -qDEB_HOST_ARCH`
+if [ -z "$ARCHES" ]; then
+	CPU=`dpkg-architecture -qDEB_HOST_DPKG_CPU 2>/dev/null || true`
+	if [ -z "$CPU" ]; then
+		CPU=`dpkg-architecture -qDEB_HOST_ARCH`
+	fi
+	KERNEL=`dpkg-architecture -qDEB_HOST_DPKG_OS 2>/dev/null || true`
+	if [ -z "$KERNEL" ]; then
+		KERNEL=linux
+	fi
+	if [ $KERNEL = linux ] ; then
+		ARCHES=$CPU
+	else
+		ARCHES="$KERNEL-$CPU"
+	fi
+	export ARCHES
 fi
-KERNEL=`dpkg-architecture -qDEB_HOST_DPKG_OS 2>/dev/null || true`
-if [ "$KERNEL"x = ""x ] ; then
-    KERNEL=linux
-fi
-if [ $KERNEL = linux ] ; then
-    ARCHES=$CPU
-else
-    ARCHES="$KERNEL-$CPU"
-fi
-export CPU KERNEL ARCHES
 
 # IMPORTANT : The 4 following paths must be on the same partition/device.
 #	      If they aren't then you must set COPYLINK below to 1. This
diff --git a/debian/CONF.sh b/debian/CONF.sh
index e6cb15c2..7e33050b 100644
--- a/debian/CONF.sh
+++ b/debian/CONF.sh
@@ -53,7 +53,7 @@ export BASEDIR=`pwd`
 export CODENAME=etch
 
 # By default use Debian installer packages from $CODENAME
-if [ ! "$DI_CODENAME" ]; then
+if [ -z "$DI_CODENAME" ]; then
 	export DI_CODENAME=$CODENAME
 fi
 
@@ -74,20 +74,22 @@ export OFFICIAL="Unofficial"
 #export OFFICIAL="Official Beta"
 
 # ... for arch
-CPU=`dpkg-architecture -qDEB_HOST_DPKG_CPU 2>/dev/null || true`
-if [ "$CPU"x = ""x ] ; then
-    CPU=`dpkg-architecture -qDEB_HOST_ARCH`
+if [ -z "$ARCHES" ]; then
+	CPU=`dpkg-architecture -qDEB_HOST_DPKG_CPU 2>/dev/null || true`
+	if [ -z "$CPU" ]; then
+		CPU=`dpkg-architecture -qDEB_HOST_ARCH`
+	fi
+	KERNEL=`dpkg-architecture -qDEB_HOST_DPKG_OS 2>/dev/null || true`
+	if [ -z "$KERNEL" ]; then
+		KERNEL=linux
+	fi
+	if [ $KERNEL = linux ] ; then
+		ARCHES=$CPU
+	else
+		ARCHES="$KERNEL-$CPU"
+	fi
+	export ARCHES
 fi
-KERNEL=`dpkg-architecture -qDEB_HOST_DPKG_OS 2>/dev/null || true`
-if [ "$KERNEL"x = ""x ] ; then
-    KERNEL=linux
-fi
-if [ $KERNEL = linux ] ; then
-    ARCHES=$CPU
-else
-    ARCHES="$KERNEL-$CPU"
-fi
-export CPU KERNEL ARCHES
 
 # IMPORTANT : The 4 following paths must be on the same partition/device.
 #	      If they aren't then you must set COPYLINK below to 1. This
diff --git a/debian/changelog b/debian/changelog
index 5cd34292..f7128f3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -165,12 +165,14 @@ debian-cd (3.0.0) UNRELEASED; urgency=low
   * Don't put ppc boot files on discs >1.
   * Add more hfs options to m68k discs, to match ppc.
   * Make list2cds more verbose in log output, especially when
-    dependencies have failed so a package can't be added
+    dependencies have failed so a package can't be added.
 
   [ Frans Pop ]
-  * CONF.sh: case can handle empty variables fine; whitespace cleanup
+  * CONF.sh: case can handle empty variables fine; whitespace cleanup.
+  * CONF.sh: don't determine ARCHES if already set; don't export CPU and
+    KERNEL.
 
- -- Frans Pop <fjp@debian.org>  Mon, 18 Dec 2006 16:14:02 +0100
+ -- Frans Pop <fjp@debian.org>  Mon, 18 Dec 2006 16:20:22 +0100
 
 debian-cd (2.2.25) unstable; urgency=low