[PATCH] pdebuild: Move "$@" to end of "arg chain" for PDEBUILD_BUILDER calls

[Loïc Minier]

Move "$@" to end of "arg chain" for PDEBUILD_BUILDER calls as to allow
a "--buildresult" flag to override the one passed to pbuilder; thanks
Michael Vogt; Launchpad #129586.
---
 pdebuild |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pdebuild b/pdebuild
index d83df04..4609431 100644
--- a/pdebuild
+++ b/pdebuild
@@ -45,7 +45,7 @@ export BUILDRESULTUID=$(id -u)
 export BUILDRESULTGID=$(id -g)
 
 if [ "${USE_PDEBUILD_INTERNAL}" = 'yes' ]; then
-    ${PBUILDERROOTCMD} ${PDEBUILD_PBUILDER} --execute "$@" ${EXTRA_CONFIGFILE[@]/#/--configfile } --bindmounts $(readlink -f ..) -- /usr/lib/pbuilder/pdebuild-internal ${PWD} --debbuildopts "${DEBBUILDOPTS}" --uid "${BUILDRESULTUID}" --gid "${BUILDRESULTGID}" --pbuildersatisfydepends "$PBUILDERSATISFYDEPENDSCMD"
+    ${PBUILDERROOTCMD} ${PDEBUILD_PBUILDER} --execute ${EXTRA_CONFIGFILE[@]/#/--configfile } --bindmounts $(readlink -f ..) "$@" -- /usr/lib/pbuilder/pdebuild-internal ${PWD} --debbuildopts "${DEBBUILDOPTS}" --uid "${BUILDRESULTUID}" --gid "${BUILDRESULTGID}" --pbuildersatisfydepends "$PBUILDERSATISFYDEPENDSCMD"
     if [ -d "${BUILDRESULT}" ]; then
 	for files in $(sed -rn '/^Files:/,${s/^ .* ([^ ]+)$/\1/p}' ../${CHANGES}); do
 	    cp -a ../"$files" "${BUILDRESULT}"
@@ -60,7 +60,7 @@ else
 	echo "W: Unmet build-dependency in source" >&2
     fi
     echo "dpkg-buildpackage -S -us -uc -r${BUILDSOURCEROOTCMD} $DEBBUILDOPTS" | perl -pe 's/(^|\s)-[bB](\s|$)/$1$2/g' | /bin/bash
-    ${PBUILDERROOTCMD} ${PDEBUILD_PBUILDER} --build "$@" ${EXTRA_CONFIGFILE[@]/#/--configfile } --buildresult "${BUILDRESULT}"  --debbuildopts "${DEBBUILDOPTS}" ../"${PKG_SOURCENAME}_${PKG_VERSION}".dsc
+    ${PBUILDERROOTCMD} ${PDEBUILD_PBUILDER} --build ${EXTRA_CONFIGFILE[@]/#/--configfile } --buildresult "${BUILDRESULT}"  --debbuildopts "${DEBBUILDOPTS}" "$@"  ../"${PKG_SOURCENAME}_${PKG_VERSION}".dsc
 fi
 
 # do signing with optional key specifier
-- 
1.5.6.3


--1yeeQ81UyVL57Vl7
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="0005-Drop-build-dep-on-rootstrap-only-used-at-runtime.patch"