diff options
| author | dancer <dancer> | 2003-03-12 08:33:36 +0000 |
|---|---|---|
| committer | dancer <dancer> | 2003-03-12 08:33:36 +0000 |
| commit | 7f6aa0c2ed01fa796b94983021ec90de40f37840 (patch) | |
| tree | 8c41807fa20f29d2e2c136fafc2743887b9a8498 /pbuilder-modules | |
| parent | 86469c64bb6bc6d5961a5e0039dda3621318ef61 (diff) | |
| download | pbuilder-7f6aa0c2ed01fa796b94983021ec90de40f37840.tar pbuilder-7f6aa0c2ed01fa796b94983021ec90de40f37840.tar.gz | |
+
+ * pbuilder-modules (pbuilder-options): fix applying of preserve-buildplace patch.
+
+ * pbuilder-checkparams (PRESERVE_BUILDPLACE): thinko fix.
+ do not unset buildresult.
+ 184420,184422
Diffstat (limited to 'pbuilder-modules')
| -rw-r--r-- | pbuilder-modules | 4 |
1 files changed, 2 insertions, 2 deletions
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 |