This is an automated email from the git hooks/post-receive script. jamessan pushed a commit to branch master in repository devscripts.
commit bb347a8a488a7633eb00ec23fdcc8e5fbdce3ce4 Author: James McCoy <[email protected]> Date: Mon Oct 13 22:35:10 2014 -0400 Fix all the other calls to dpkg-architecture Signed-off-by: James McCoy <[email protected]> --- debian/changelog | 7 +++++++ scripts/cvs-debi.sh | 6 +++++- scripts/cvs-debrelease.sh | 6 +++++- scripts/debrelease.sh | 4 +++- scripts/debrsign.sh | 6 +++++- scripts/debsign.sh | 6 +++++- 6 files changed, 30 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1a07a92..99cca3f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +devscripts (2.14.10) UNRELEASED; urgency=medium + + * Fix all the other calls to dpkg-architecture in devscripts. + (Closes: #764963 ... again) + + -- James McCoy <[email protected]> Mon, 13 Oct 2014 22:33:10 -0400 + devscripts (2.14.9) unstable; urgency=medium * debuild: Only pass -a/-t to dpkg-architecture when the user has specified diff --git a/scripts/cvs-debi.sh b/scripts/cvs-debi.sh index a310de1..1230ec5 100755 --- a/scripts/cvs-debi.sh +++ b/scripts/cvs-debi.sh @@ -340,7 +340,11 @@ fi # The next part is based on debi -setq arch "`dpkg-architecture -a${targetarch} -t${targetgnusystem} -qDEB_HOST_ARCH`" "build architecture" +if [ -n "$targetarch" ] && [ -n "$targetgnusystem" ]; then + setq arch "$(dpkg-architecture "-a${targetarch}" "-t${targetgnusystem}" -qDEB_HOST_ARCH)" "build architecture" +else + setq arch "$(dpkg-architecture -qDEB_HOST_ARCH)" "build architecture" +fi pva="${package}_${non_epoch_version}_${arch}" changes="$pva.changes" diff --git a/scripts/cvs-debrelease.sh b/scripts/cvs-debrelease.sh index b55e32e..262d17f 100755 --- a/scripts/cvs-debrelease.sh +++ b/scripts/cvs-debrelease.sh @@ -353,7 +353,11 @@ if [ ! -d "$pkgdir" ]; then exit 1 fi -setq arch "`dpkg-architecture -a${targetarch} -t${targetgnusystem} -qDEB_HOST_ARCH`" "build architecture" +if [ -n "$targetarch" ] && [ -n "$targetgnusystem" ]; then + setq arch "$(dpkg-architecture "-a${targetarch}" "-t${targetgnusystem}" -qDEB_HOST_ARCH)" "build architecture" +else + setq arch "$(dpkg-architecture -qDEB_HOST_ARCH)" "build architecture" +fi pva="${package}_${non_epoch_version}_${arch}" changes="$pva.changes" diff --git a/scripts/debrelease.sh b/scripts/debrelease.sh index d567dcb..de71a45 100755 --- a/scripts/debrelease.sh +++ b/scripts/debrelease.sh @@ -287,8 +287,10 @@ fi if [ "x$sourceonly" = "xsource" ]; then arch=source +elif [ -n "$targetarch" ] && [ -n "$targetgnusystem" ]; then + mustsetvar arch "$(dpkg-architecture "-a${targetarch}" "-t${targetgnusystem}" -qDEB_HOST_ARCH)" "build architecture" else - mustsetvar arch "`dpkg-architecture -a${targetarch} -t${targetgnusystem} -qDEB_HOST_ARCH`" "build architecture" + mustsetvar arch "$(dpkg-architecture -qDEB_HOST_ARCH)" "build architecture" fi sversion=`echo "$version" | perl -pe 's/^\d+://'` diff --git a/scripts/debrsign.sh b/scripts/debrsign.sh index 77a5e2a..d5c428b 100755 --- a/scripts/debrsign.sh +++ b/scripts/debrsign.sh @@ -162,7 +162,11 @@ case $# in if [ "x$sourceonly" = x ] then - mustsetvar arch "`dpkg-architecture -a${targetarch} -t${targetgnusystem} -qDEB_HOST_ARCH`" "build architecture" + if [ -n "$targetarch" ] && [ -n "$targetgnusystem" ]; then + mustsetvar arch "$(dpkg-architecture "-a${targetarch}" "-t${targetgnusystem}" -qDEB_HOST_ARCH)" "build architecture" + else + mustsetvar arch "$(dpkg-architecture -qDEB_HOST_ARCH)" "build architecture" + fi else arch=source fi diff --git a/scripts/debsign.sh b/scripts/debsign.sh index 1fc5ff2..4d710a7 100755 --- a/scripts/debsign.sh +++ b/scripts/debsign.sh @@ -637,7 +637,11 @@ case $# in if [ "x$sourceonly" = x ] then - mustsetvar arch "`dpkg-architecture -a${targetarch} -t${targetgnusystem} -qDEB_HOST_ARCH`" "build architecture" + if [ -n "$targetarch" ] && [ -n "$targetgnusystem" ]; then + mustsetvar arch "$(dpkg-architecture "-a${targetarch}" "-t${targetgnusystem}" -qDEB_HOST_ARCH)" "build architecture" + else + mustsetvar arch "$(dpkg-architecture -qDEB_HOST_ARCH)" "build architecture" + fi else arch=source fi -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git _______________________________________________ devscripts-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel
