diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | pbuilder-buildpackage-funcs | 6 | ||||
| -rw-r--r-- | pbuilder-modules | 6 | ||||
| -rwxr-xr-x | pbuilder-updatebuildenv | 2 |
5 files changed, 21 insertions, 6 deletions
@@ -1,3 +1,9 @@ +2004-06-17 Junichi Uekawa <dancer@debian.org> + + * pbuilder-updatebuildenv: Patch from matt kraai to save + apt cache when pbuilder update fails. + 252777, 252793 + 2004-05-27 Junichi Uekawa <dancer@debian.org> * debian/control (Depends): add coreutils 4.5.8-1 dependency. diff --git a/debian/changelog b/debian/changelog index 0164911..cd83108 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +pbuilder (0.106) unstable; urgency=low + + * Patch from Matt Kraai to allow apt cache to be saved + even when pbuilder update fails. (closes: #252777, #252793) + + -- Junichi Uekawa <dancer@debian.org> Thu, 17 Jun 2004 09:22:12 +0900 + pbuilder (0.105) unstable; urgency=low * add readlink dependency; coreutils now has it, not debianutils diff --git a/pbuilder-buildpackage-funcs b/pbuilder-buildpackage-funcs index 668c0f9..2860b65 100644 --- a/pbuilder-buildpackage-funcs +++ b/pbuilder-buildpackage-funcs @@ -66,12 +66,6 @@ function showbuildbanner () { echo } -function saveaptcache_umountproc_cleanbuildplace () { - # save the apt cache, and call umountproc_cleanbuildplace - save_aptcache - umountproc_cleanbuildplace -} - function createbuilduser () { # create the build user if [ -n "$SUTOUSER" ]; then diff --git a/pbuilder-modules b/pbuilder-modules index 9289ca6..1e6232d 100644 --- a/pbuilder-modules +++ b/pbuilder-modules @@ -203,6 +203,12 @@ function umountproc_cleanbuildplace () { cleanbuildplace } +function saveaptcache_umountproc_cleanbuildplace () { + # save the apt cache, and call umountproc_cleanbuildplace + save_aptcache + umountproc_cleanbuildplace +} + function installaptlines (){ echo " -> Installing apt-lines" rm -f "$BUILDPLACE"/etc/apt/sources.list diff --git a/pbuilder-updatebuildenv b/pbuilder-updatebuildenv index 6fcf198..34ea72e 100755 --- a/pbuilder-updatebuildenv +++ b/pbuilder-updatebuildenv @@ -43,9 +43,11 @@ if [ -n "$REMOVEPACKAGES" ]; then fi recover_aptcache +$TRAP saveaptcache_umountproc_cleanbuildplace exit $CHROOTEXEC /usr/bin/apt-get -y "${FORCE_CONFNEW[@]}" dist-upgrade $CHROOTEXEC /usr/bin/apt-get -y install build-essential dpkg-dev apt $EXTRAPACKAGES save_aptcache +$TRAP umountproc_cleanbuildplace exit $CHROOTEXEC /usr/bin/apt-get clean || true executehooks "E" |