diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rwxr-xr-x | pbuilder-updatebuildenv | 13 |
3 files changed, 13 insertions, 7 deletions
@@ -1,3 +1,8 @@ +2002-01-24 Junichi Uekawa <dancer@debian.org> + + * pbuilder-updatebuildenv: Aborting function is performed through + trap * exit. Probably others too need to be done this way. + 2002-01-22 Junichi Uekawa <dancer@debian.org> * pbuilder-updatebuildenv: added a aborting function abortprocess, diff --git a/debian/changelog b/debian/changelog index 725d7fe..50298c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,7 @@ pbuilder (0.19) unstable; urgency=low * new version, not yet released * Added "pbuilder update" temp file cleaning process. - -- Junichi Uekawa <dancer@debian.org> Tue, 22 Jan 2002 15:53:31 +0900 + -- Junichi Uekawa <dancer@debian.org> Thu, 24 Jan 2002 02:51:40 +0900 pbuilder (0.18) unstable; urgency=low diff --git a/pbuilder-updatebuildenv b/pbuilder-updatebuildenv index d53510b..cff78b6 100755 --- a/pbuilder-updatebuildenv +++ b/pbuilder-updatebuildenv @@ -22,18 +22,19 @@ if [ -n "$HOOKDIR" ]; then fi echo "Refreshing the base.tgz " echo " -> upgrading packages" -$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 +trap abortprocess exit +$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 if [ -n "$HOOKDIR" ]; then executehooks "X" unloadhooks fi - umountproc +trap cleanbuildplace exit echo " -> creating base.tgz" (cd "$BUILDPLACE"; tar cfz "$BASETGZ" *) cleanbuildplace |