diff options
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | pbuilder-modules | 16 | ||||
| -rwxr-xr-x | pbuilder-updatebuildenv | 2 |
5 files changed, 26 insertions, 11 deletions
@@ -5,4 +5,5 @@ Dale Amon <amon@vnl.com> -- for runhooks Daniel Kobras -- Patches and bugfixes for non-interactive building, and some other bugs. + $Id$
\ No newline at end of file @@ -1,3 +1,12 @@ +2002-02-12 Junichi Uekawa <dancer@debian.org> + + * pbuilder-updatebuildenv: apt-get clean is handled with ||true + + * pbuilder-modules: some notes will be given if cache content is empty + Added more check. + + * debian/changelog: updated the changelog, adding notes. + 2002-02-11 Junichi Uekawa <dancer@debian.org> * pbuilder-buildpackage: added a banner for pbuilder diff --git a/debian/changelog b/debian/changelog index 861abee..1dbf5ec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,14 +5,15 @@ pbuilder (0.22) unstable; urgency=low for "Build-depends" to cope with some packages like bzip2. (closes: #133054) * pbuilder create/update will use cached packages in addition to "build". However, the packages fed to debootstrap are not cached. - (please test) * Supports Build-Depends without spaces like freefem (closes: #133162) - * Version requirement on debootstrap bumped up to the fixed version, 0.1.16.2. + * Version requirement on debootstrap bumped up to the + fixed version, 0.1.16.2. That package is installed at last. * Documentation updates - * Messages improvement, for automatic drives. + * Messages improvement, for automatic operation + * Adding check for empty-cache state. - -- Junichi Uekawa <dancer@debian.org> Mon, 11 Feb 2002 18:39:11 +0900 + -- Junichi Uekawa <dancer@debian.org> Tue, 12 Feb 2002 01:03:53 +0900 pbuilder (0.21) unstable; urgency=low diff --git a/pbuilder-modules b/pbuilder-modules index 30ff7ff..0f73378 100644 --- a/pbuilder-modules +++ b/pbuilder-modules @@ -173,10 +173,14 @@ function recover_aptcache() { # recover the aptcache archive if [ -n "$APTCACHE" ]; then echo "Obtaining the cached apt archive contents" - if [ "$APTCACHEHARDLINK" = "yes" ]; then - ln "$APTCACHE"/*.deb "$BUILDPLACE/var/cache/apt/archives/" || true + if ls "$APTCACHE"/*.deb > /dev/null 2> /dev/null ; then + if [ "$APTCACHEHARDLINK" = "yes" ]; then + ln "$APTCACHE"/*.deb "$BUILDPLACE/var/cache/apt/archives/" || true + else + cp "$APTCACHE"/*.deb "$BUILDPLACE/var/cache/apt/archives/" || true + fi else - cp "$APTCACHE"/*.deb "$BUILDPLACE/var/cache/apt/archives/" || true + echo "W: No cache contents yet." fi fi } @@ -187,12 +191,12 @@ function save_aptcache() { echo "Copying back the cached apt archive contents" mkdir -p "$APTCACHE" ; for A in "$BUILDPLACE/var/cache/apt/archives/"*.deb; do - if [ ! -f "$APTCACHE/"$(basename "$A") ]; then + if [ ! -f "$APTCACHE/"$(basename "$A") -a -f "$A" ]; then echo " -> new cache content "$(basename "$A")" added" if [ "$APTCACHEHARDLINK" = "yes" ]; then - ln "$A" "$APTCACHE/" + ln "$A" "$APTCACHE/" || true else - cp "$A" "$APTCACHE/" + cp "$A" "$APTCACHE/" || true fi fi done diff --git a/pbuilder-updatebuildenv b/pbuilder-updatebuildenv index 41c8876..5a191ae 100755 --- a/pbuilder-updatebuildenv +++ b/pbuilder-updatebuildenv @@ -40,7 +40,7 @@ recover_aptcache $CHROOTEXEC /usr/bin/apt-get -y dist-upgrade $CHROOTEXEC /usr/bin/apt-get -y install build-essential dpkg-dev apt $EXTRAPACKAGES save_aptcache -$CHROOTEXEC /usr/bin/apt-get clean +$CHROOTEXEC /usr/bin/apt-get clean || true if [ -n "$HOOKDIR" ]; then executehooks "X" |