diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rwxr-xr-x | pbuilder | 5 | ||||
| -rwxr-xr-x | pbuilder-createbuildenv | 4 | ||||
| -rwxr-xr-x | pbuilder-updatebuildenv | 4 |
5 files changed, 16 insertions, 9 deletions
@@ -1,3 +1,10 @@ +2006-02-12 Junichi Uekawa <dancer@debian.org> + + * pbuilder-updatebuildenv: + * pbuilder-createbuildenv: + * pbuilder: move apt-get clean after umountproc, so that you can + probably bind-mount /var/cache/apt/archives + 2006-02-11 Junichi Uekawa <dancer@debian.org> * pbuilder-satisfydepends: quote echo INSTALLPKGMULTI diff --git a/debian/changelog b/debian/changelog index 4f4d520..c34430e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ pbuilder (0.148) UNRELEASED; urgency=low - * + * Bug fix: "[Feature request] support bind-mounted apt package cache", + thanks to Michel Daenzer (Closes: #236304). - -- Junichi Uekawa <dancer@debian.org> Sun, 12 Feb 2006 13:23:57 +0900 + -- Junichi Uekawa <dancer@debian.org> Sun, 12 Feb 2006 13:33:09 +0900 pbuilder (0.147) unstable; urgency=low @@ -71,7 +71,6 @@ File extracted to: $BUILDPLACE ${CHROOTEXEC} bin/bash save_aptcache - ${CHROOTEXEC} /usr/bin/apt-get clean trap umountproc_cleanbuildplace exit @@ -84,6 +83,7 @@ File extracted to: $BUILDPLACE unloadhooks umountproc trap cleanbuildplace exit + ${CHROOTEXEC} /usr/bin/apt-get clean || true create_basetgz fi fi @@ -114,8 +114,6 @@ File extracted to: $BUILDPLACE ${CHROOTEXEC} /run "$@" save_aptcache - ${CHROOTEXEC} /usr/bin/apt-get clean - trap umountproc_cleanbuildplace exit # saving the place afterwards @@ -127,6 +125,7 @@ File extracted to: $BUILDPLACE unloadhooks umountproc trap cleanbuildplace exit + ${CHROOTEXEC} /usr/bin/apt-get clean || true create_basetgz fi fi diff --git a/pbuilder-createbuildenv b/pbuilder-createbuildenv index e387043..13307a7 100755 --- a/pbuilder-createbuildenv +++ b/pbuilder-createbuildenv @@ -90,12 +90,12 @@ recover_aptcache $CHROOTEXEC /usr/bin/apt-get -y --force-yes dist-upgrade $CHROOTEXEC /usr/bin/apt-get -y --force-yes install build-essential dpkg-dev apt $EXTRAPACKAGES save_aptcache -$CHROOTEXEC /usr/bin/apt-get clean executehooks "E" unloadhooks - umountproc +$CHROOTEXEC /usr/bin/apt-get clean || true + $TRAP cleanbuildplace exit # Internal_build_uml is set when --no-targz is set, this code is actually never called from pbuilder-user-mode-linux diff --git a/pbuilder-updatebuildenv b/pbuilder-updatebuildenv index 75a524f..7a0a0b3 100755 --- a/pbuilder-updatebuildenv +++ b/pbuilder-updatebuildenv @@ -63,12 +63,12 @@ if [ "${AUTOCLEANAPTCACHE}" = "yes" -a -n "$APTCACHE" ]; then fi $TRAP umountproc_cleanbuildplace exit -$CHROOTEXEC /usr/bin/apt-get clean || true - executehooks "E" unloadhooks umountproc +$CHROOTEXEC /usr/bin/apt-get clean || true + $TRAP cleanbuildplace exit if [ ! "${INTERNAL_BUILD_UML}" = "yes" ]; then create_basetgz |