diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rwxr-xr-x | pbuilder-updatebuildenv | 16 |
3 files changed, 18 insertions, 6 deletions
@@ -1,3 +1,8 @@ +2002-01-22 Junichi Uekawa <dancer@debian.org> + + * pbuilder-updatebuildenv: added a aborting function abortprocess, + so that any upgrade process that fails will clean up. + 2002-01-18 Junichi Uekawa <dancer@debian.org> * pbuilder-checkparams: fixed a typo. diff --git a/debian/changelog b/debian/changelog index 6602088..725d7fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ pbuilder (0.19) unstable; urgency=low * new version, not yet released + * Added "pbuilder update" temp file cleaning process. - -- Junichi Uekawa <dancer@debian.org> Mon, 21 Jan 2002 15:46:38 +0900 + -- Junichi Uekawa <dancer@debian.org> Tue, 22 Jan 2002 15:53:31 +0900 pbuilder (0.18) unstable; urgency=low diff --git a/pbuilder-updatebuildenv b/pbuilder-updatebuildenv index d773346..d53510b 100755 --- a/pbuilder-updatebuildenv +++ b/pbuilder-updatebuildenv @@ -5,6 +5,12 @@ set -e . /usr/lib/pbuilder/pbuilder-checkparams . /usr/lib/pbuilder/pbuilder-runhooks +function abortprocess () { +# function to do the aborting process in pbuilder-updatebuildenv + umountproc + cleanbuildplace +} + CHROOTEXEC="chroot $BUILDPLACE " test -n "$DISTRIBUTION" && echo "Upgrading for distribution $DISTRIBUTION" @@ -16,11 +22,11 @@ if [ -n "$HOOKDIR" ]; then fi echo "Refreshing the base.tgz " echo " -> upgrading packages" -$CHROOTEXEC /usr/bin/apt-get update -$CHROOTEXEC /usr/bin/dpkg --purge lilo -$CHROOTEXEC /usr/bin/apt-get -y dist-upgrade -$CHROOTEXEC /usr/bin/apt-get -y install build-essential dpkg-dev apt $EXTRAPACKAGES -$CHROOTEXEC /usr/bin/apt-get clean +$CHROOTEXEC /usr/bin/apt-get update || abortprocess +$CHROOTEXEC /usr/bin/dpkg --purge lilo || abortprocess +$CHROOTEXEC /usr/bin/apt-get -y dist-upgrade || abortprocess +$CHROOTEXEC /usr/bin/apt-get -y install build-essential dpkg-dev apt $EXTRAPACKAGES || abortprocess +$CHROOTEXEC /usr/bin/apt-get clean || abortprocess if [ -n "$HOOKDIR" ]; then executehooks "X" |