Hi,
It's not obvious where PARENT_DIR is defined, is this correct?
At Tue, 1 Nov 2011 15:55:25 -0700,
Tom Hughes (Palm GBU) wrote:
>
> From 9cf8a0cb800b734e2e3a4e67a14cf78442378144 Mon Sep 17 00:00:00 2001
> From: Tom Hughes <tom.hug...@palm.com>
> Date: Tue, 1 Nov 2011 15:50:41 -0700
> Subject: [PATCH] Avoid dsc copy error when using build-internal and
> buildresult=.. (closes: #422272)
>
> ---
> pdebuild | 9 +++++++--
> 1 files changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/pdebuild b/pdebuild
> index 28dff21..1b1c132 100644
> --- a/pdebuild
> +++ b/pdebuild
> @@ -46,10 +46,15 @@ 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
> "${DEBBUILDOPTS}" --uid "${BUILDRESULTUID}" --gid "${BUILDRESULTGID}"
> --pbuildersatisfydepends "$PBUILDERSATISFYDEPENDSCMD"
> if [ -d "${BUILDRESULT}" ]; then
> + echo "parent dir: ${PARENT_DIR}"
> for files in $(sed -rn '/^Files:/,${s/^ .* ([^ ]+)$/\1/p}'
> ../${CHANGES}); do
> - cp -a ../"$files" "${BUILDRESULT}"
> + if [ "${PARENT_DIR}" != "${BUILDRESULT}" ]; then
> + cp -a ../"$files" "${BUILDRESULT}"
> + fi
> done
> - cp -a ../${CHANGES} "${BUILDRESULT}"
> + if [ "${PARENT_DIR}" != "${BUILDRESULT}" ]; then
> + cp -a ../${CHANGES} "${BUILDRESULT}"
> + fi
> else
> log "E: BUILDRESULT=[$BUILDRESULT] is not a directory."
> exit 1
> --
> 1.7.7.1
>
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
