diff options
| author | Loïc Minier <lool@dooz.org> | 2009-12-12 16:06:08 +0100 |
|---|---|---|
| committer | Loïc Minier <lool@dooz.org> | 2009-12-12 16:06:08 +0100 |
| commit | 4639b8e84cf47899655bbe9f04279493ed99ee01 (patch) | |
| tree | 33172b1b9399c6b3ae1b67c14d2b67a070eaa423 /pdebuild | |
| parent | 070f8c798b9b2d98ef98a8407b8812ce9ab745ad (diff) | |
| download | pbuilder-4639b8e84cf47899655bbe9f04279493ed99ee01.tar pbuilder-4639b8e84cf47899655bbe9f04279493ed99ee01.tar.gz | |
Make --debbuildopts additive
Change --debbuildopts to be additive and reset the list of options to
the empty list if --debbuildopts "" is passed. Update docs and add NEWS
entry.
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 "${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 log "W: Unmet build-dependency in source" 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 "${DEBBUILDOPTS}" "$@" ../"${PKG_SOURCENAME}_${PKG_VERSION}".dsc fi # do signing with optional key specifier |