From 7aa69397d99fff86196c3a835551f099e4603057 Mon Sep 17 00:00:00 2001
From: Junichi Uekawa <dancer@netfort.gr.jp>
Date: Fri, 9 Mar 2012 08:14:19 +0900
Subject: make longer lines wrap so reading patch files aren't as painful.

---
 pdebuild | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

(limited to 'pdebuild')

diff --git a/pdebuild b/pdebuild
index 35966bd..97df19b 100644
--- a/pdebuild
+++ b/pdebuild
@@ -44,7 +44,20 @@ 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 "${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
 	    conditional_cp_a ../"$files" "${BUILDRESULT}"
@@ -58,8 +71,18 @@ else
     if ! dpkg-checkbuilddeps -B ; then
 	log "W: Unmet build-dependency in source"
     fi
-    echo "dpkg-buildpackage -S -us -uc -r${BUILDSOURCEROOTCMD} $DEBBUILDOPTS" | perl -pe 's/(^|\s)-[AbBF](\s|$)/$1$2/g' | /bin/bash
-    ${PBUILDERROOTCMD} ${PDEBUILD_PBUILDER} --build ${EXTRA_CONFIGFILE[@]/#/--configfile } --buildresult "${BUILDRESULT}" --debbuildopts "" --debbuildopts "${DEBBUILDOPTS}" "$@"  ../"${PKG_SOURCENAME}_${PKG_VERSION}".dsc
+    echo "dpkg-buildpackage -S -us -uc -r${BUILDSOURCEROOTCMD} $DEBBUILDOPTS" | \
+	perl -pe 's/(^|\s)-[AbBF](\s|$)/$1$2/g' | \
+	/bin/bash
+    ${PBUILDERROOTCMD} \
+	${PDEBUILD_PBUILDER} \
+	--build \
+	${EXTRA_CONFIGFILE[@]/#/--configfile } \
+	--buildresult "${BUILDRESULT}" \
+	--debbuildopts "" \
+	--debbuildopts "${DEBBUILDOPTS}" \
+	"$@" \
+	../"${PKG_SOURCENAME}_${PKG_VERSION}".dsc
 fi
 
 # do signing with optional key specifier
-- 
cgit v1.2.3