There was a typo in the last patch. Attached is a fixed version.
From 489c774e85244c1c203e76c5fbc103a7995e2679 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..6502f2f 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
+ PARENT_DIR=`dirname $(pwd)`
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
