diff options
| author | Loïc Minier <lool@dooz.org> | 2008-06-27 19:22:03 +0200 |
|---|---|---|
| committer | Loïc Minier <lool@dooz.org> | 2008-06-27 19:22:03 +0200 |
| commit | 5f7293bd5d0e7f3c90090a96d366122e9bec8a66 (patch) | |
| tree | 1044dfb79f452c3fddded88bd66f16cb61be5647 /pdebuild | |
| parent | 9018a81cbd68dd2eb9467bf75f7a45d612b33e54 (diff) | |
| download | pbuilder-5f7293bd5d0e7f3c90090a96d366122e9bec8a66.tar pbuilder-5f7293bd5d0e7f3c90090a96d366122e9bec8a66.tar.gz | |
pdebuild: Move "$@" to end of "arg chain" for PDEBUILD_BUILDER calls
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.
Diffstat (limited to 'pdebuild')
| -rw-r--r-- | pdebuild | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 |