Fix wheezy variants (older "dpkg-architecture", no "--query")

Author: tianon

2.7/wheezy/Dockerfile

@@ -35,7 +35,7 @@ RUN set -ex \
 	&& rm python.tar.xz \
 	\
 	&& cd /usr/src/python \
-	&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+	&& gnuArch="$(dpkg-architecture -qDEB_BUILD_GNU_TYPE)" \
 	&& ./configure \
 		--build="$gnuArch" \
 		--enable-shared \

3.3/wheezy/Dockerfile

@@ -41,7 +41,7 @@ RUN set -ex \
 	&& rm python.tar.xz \
 	\
 	&& cd /usr/src/python \
-	&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+	&& gnuArch="$(dpkg-architecture -qDEB_BUILD_GNU_TYPE)" \
 	&& ./configure \
 		--build="$gnuArch" \
 		--enable-loadable-sqlite-extensions \

3.4/wheezy/Dockerfile

@@ -41,7 +41,7 @@ RUN set -ex \
 	&& rm python.tar.xz \
 	\
 	&& cd /usr/src/python \
-	&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+	&& gnuArch="$(dpkg-architecture -qDEB_BUILD_GNU_TYPE)" \
 	&& ./configure \
 		--build="$gnuArch" \
 		--enable-loadable-sqlite-extensions \

update.sh

@@ -94,7 +94,11 @@ for version in "${versions[@]}"; do
 			done
 			if [ -d "$version/wheezy" ]; then
 				cp "$version/Dockerfile" "$version/wheezy/Dockerfile"
-				sed -ri 's/:jessie/:wheezy/g' "$version/wheezy/Dockerfile"
+				# wheezy-only: dpkg-architecture: unknown option `--query'
+				sed -ri \
+					-e 's/:jessie/:wheezy/g' \
+					-e 's/dpkg-architecture --query /dpkg-architecture -q/g' \
+					"$version/wheezy/Dockerfile"
 			fi
 		fi
 		(