+

+	* pbuilder-modules (pbuilder-options): fix applying of preserve-buildplace patch.
+
+	* pbuilder-checkparams (PRESERVE_BUILDPLACE): thinko fix.
+	do not unset buildresult.
+	184420,184422

4 files changed, 18 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 581863a..49e8ceb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-03-12  Junichi Uekawa  <dancer@debian.org>
+
+	* pbuilder-modules (pbuilder-options): fix applying of preserve-buildplace patch.
+
+	* pbuilder-checkparams (PRESERVE_BUILDPLACE): thinko fix.
+	do not unset buildresult.
+	184420,184422
+
 2003-03-11  Junichi Uekawa  <dancer@debian.org>
 
 	* pbuilder-buildpackage (PACKAGENAME): add missing PACKAGENAME.
diff --git a/debian/changelog b/debian/changelog
index d2677f6..2ef27e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pbuilder (0.69) UNKNOWN; urgency=low
+
+  * fix hand-applying mistakes in --preserve-buildplace patch  (closes: #184418)
+  * fix thinko in --buildresult fix. (closes: #184420,184422)
+
+ -- Junichi Uekawa <dancer@debian.org>  Wed, 12 Mar 2003 17:35:33 +0900
+
 pbuilder (0.68) unstable; urgency=low
 
   * fix --buildresult behavior
diff --git a/pbuilder-checkparams b/pbuilder-checkparams
index db54ad0..c96b2a8 100755
--- a/pbuilder-checkparams
+++ b/pbuilder-checkparams
@@ -60,7 +60,7 @@ while [ -n "$1" ]; do
 	    shift; shift;
 	    ;;
 	--buildresult)
-	    if [ -n '' ]; then
+	    if [ -n "$2" ]; then
 		BUILDRESULT=$(readlink -f "$2");
 	    else
 		BUILDRESULT=
diff --git a/pbuilder-modules b/pbuilder-modules
index a693cbb..315e069 100644
--- a/pbuilder-modules
+++ b/pbuilder-modules
@@ -126,7 +126,7 @@ function cleanbuildplace () {
     if [ "$?" -ne 0 ]; then
 	echo " -> Aborting with an error";
     fi
-    if [ "${INTERNAL_BUILD_UML}" != "yes" -a ! \( "${PRESERVE_BUILDPLACE}" = "yes" -a -d "$BUILDPLACE" \) ]; then
+    if [ "${INTERNAL_BUILD_UML}" != "yes" ]; then
 	if [ -d "$BUILDPLACE" ]; then 
 	    echo " -> cleaning the build env "
 	    rm -rf "$BUILDPLACE"
@@ -182,7 +182,7 @@ function copy_local_configuration () {
 function extractbuildplace () {
     # after calling this function, umountproc, and cleanbuildplace
     # needs to be called. Please trap it.
-    if [ ! "${INTERNAL_BUILD_UML}" = "yes" ]; then
+    if [ "${INTERNAL_BUILD_UML}" != "yes" -a ! \( "${PRESERVE_BUILDPLACE}" = "yes" -a -d "$BUILDPLACE" \) ]; then
 	cleanbuildplace
 	echo "Building the build Environment"
 	if ! mkdir -p "$BUILDPLACE"; then