fix always ending with "Aborting with error"

5 files changed, 28 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index a03fbf3..6a83248 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,28 @@
 2007-05-27  Junichi Uekawa  <dancer@debian.org>
 
+	* pbuilder-createbuildenv: pbuilder seems to always finish with 'Aborting with error', fix that.
+	* pbuilder-updatebuildenv: 
+
+	the following gives 0, 1 as output:
+	
+	function a_called()
+	{
+	        echo $?
+	}
+
+	function a ()
+	{
+	        a_called
+	}
+
+	trap a exit
+
+	false
+	:
+	a
+	exit 1
+	
+	
 	* pbuilder-buildpackage-funcs: set LOGNAME when build user is
 	created inside chroot.
 
diff --git a/debian/changelog b/debian/changelog
index 24b423e..e1943f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 pbuilder (0.168) UNRELEASED; urgency=low
 
   * set LOGNAME when build user is created within chroot.
+  * do not always output 'Aborting with error' on create/update
 
- -- Junichi Uekawa <dancer@debian.org>  Sun, 27 May 2007 16:11:03 +0900
+ -- Junichi Uekawa <dancer@debian.org>  Sun, 27 May 2007 19:54:37 +0900
 
 pbuilder (0.167) unstable; urgency=low
 
diff --git a/pbuilder-buildpackage b/pbuilder-buildpackage
index 74cef90..becab23 100755
--- a/pbuilder-buildpackage
+++ b/pbuilder-buildpackage
@@ -164,6 +164,7 @@ else
     echo "E: BUILDRESULT=[$BUILDRESULT] is not a directory." >&2
 fi
 
+:
 cleanbuildplace
 trap - exit sighup
 echobacktime
diff --git a/pbuilder-createbuildenv b/pbuilder-createbuildenv
index 0b5f2a3..5ccc73e 100755
--- a/pbuilder-createbuildenv
+++ b/pbuilder-createbuildenv
@@ -104,6 +104,7 @@ fi
 if [ "${PRESERVE_BUILDPLACE}" = "yes" ]; then
     :
 else
+    :
     cleanbuildplace
 fi
 trap - exit sighup
diff --git a/pbuilder-updatebuildenv b/pbuilder-updatebuildenv
index 4be2b56..bc6f2a0 100755
--- a/pbuilder-updatebuildenv
+++ b/pbuilder-updatebuildenv
@@ -76,6 +76,7 @@ fi
 if [ "${PRESERVE_BUILDPLACE}" = "yes" ]; then
     :
 else
+    :
     cleanbuildplace
 fi
 trap - exit sighup