aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordancer <dancer>2003-03-10 14:07:19 +0000
committerdancer <dancer>2003-03-10 14:07:19 +0000
commit721524e3da83e26fa0adfd2ce039bf1f7cc34829 (patch)
tree3b4ebf70bd22b60b21184e7b216145ef197a47e5
parent7489fc8a400e50c6759aa40f6b5633e44de7e054 (diff)
downloadpbuilder-721524e3da83e26fa0adfd2ce039bf1f7cc34829.tar
pbuilder-721524e3da83e26fa0adfd2ce039bf1f7cc34829.tar.gz
prepare for release of 0.67
-rw-r--r--ChangeLog2
-rw-r--r--debian/changelog4
-rwxr-xr-xpbuilder-checkparams6
-rwxr-xr-xpbuilder-user-mode-linux2
4 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 987d8a8..8a3a0c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2003-03-10 Junichi Uekawa <dancer@debian.org>
+ * pbuilder-checkparams (PRESERVE_BUILDPLACE): support pbuilder-user-mode-linux invocation for --buildresult.
+
* pbuilder.8,pbuilder-createbuildenv,pbuilder-updatebuildenv: change hook name to E.
* debian/rules: add check target for build.
diff --git a/debian/changelog b/debian/changelog
index 593f49f..db0ba52 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-pbuilder (0.67) UNRELEASED; urgency=low
+pbuilder (0.67) unstable; urgency=low
* Documentation updates, note setting PS1 in pbuilderrc (closes: #183861)
from suggestion of Barak Pearlmutter <bap@cs.unm.edu>
@@ -15,7 +15,7 @@ pbuilder (0.67) UNRELEASED; urgency=low
* Apply patch from Daniel Schepler <schepler@math.berkeley.edu>,
to support --preserve-buildplace (closes: #183605)
- -- Junichi Uekawa <dancer@debian.org> Mon, 10 Mar 2003 19:56:35 +0900
+ -- Junichi Uekawa <dancer@debian.org> Mon, 10 Mar 2003 23:03:58 +0900
pbuilder (0.66) unstable; urgency=low
diff --git a/pbuilder-checkparams b/pbuilder-checkparams
index 2e37d67..984e606 100755
--- a/pbuilder-checkparams
+++ b/pbuilder-checkparams
@@ -60,7 +60,11 @@ while [ -n "$1" ]; do
shift; shift;
;;
--buildresult)
- BUILDRESULT=$(readlink -f "$2");
+ if [ -n '' ]; then
+ BUILDRESULT=$(readlink -f "$2");
+ else
+ : # support empty case
+ fi
shift; shift;
;;
--removepackages)
diff --git a/pbuilder-user-mode-linux b/pbuilder-user-mode-linux
index 26dd576..0d1432a 100755
--- a/pbuilder-user-mode-linux
+++ b/pbuilder-user-mode-linux
@@ -110,7 +110,7 @@ if [ -z "${UML_BUILDRESULT}" ]; then
else
echo " -> Mount build result dir outside UML [${UML_BUILDRESULT}] as [${UML_CHROOT_BUILDRESULTMOUNTDIR}]"
BUILDRESULT=${UML_CHROOT_BUILDRESULTMOUNTDIR}
- mkdir -p ${UML_CHROOT_BUILDRESULTMOUNTDIR}
+ mkdir -p ${UML_CHROOT_BUILDRESULTMOUNTDIR} || true
mount -t hostfs none "${UML_CHROOT_BUILDRESULTMOUNTDIR}" -o "${UML_BUILDRESULT}"
fi
pbuilder "$1" ${UML_EXTRAOPT} \${EXTRAOPT} --buildresult "\${BUILDRESULT}" --buildplace "${UML_CHROOT_MOUNTPOINT}" --internal-build-uml ${BUILDING_DSC_FILE}