diff options
| author | dancer <dancer> | 2001-09-23 15:18:18 +0000 |
|---|---|---|
| committer | dancer <dancer> | 2001-09-23 15:18:18 +0000 |
| commit | 73dd038549ca799a4dfd93f3fc92ad6749146df2 (patch) | |
| tree | ae99ca60a678802e705fd0a718b42f9b4e3b2b27 | |
| parent | 895bf5ca88ef2702d8f6b5b6b1197b1ef1f86ac8 (diff) | |
| download | pbuilder-73dd038549ca799a4dfd93f3fc92ad6749146df2.tar pbuilder-73dd038549ca799a4dfd93f3fc92ad6749146df2.tar.gz | |
minor bugfix, and other things to make the caching to work
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | debian/dirs | 1 | ||||
| -rwxr-xr-x | pbuilder-buildpackage | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index bc4bac0..cb007a4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,14 +3,15 @@ pbuilder (0.6) unstable; urgency=low * Added a man page for /etc/pbuilderrc configuration file. Should help people understand what is going on... * Added a feature of caching the contents of /var/cache/apt/archives - inside the chroot. It's not quite apt-move, but this should do the + inside the chroot. It's not quite apt-move, but this should do the trick ? * pbuilder clean will clean the apt cache. * REMOVEPACKAGES is a configurable option now. Please be warned, if you are upgrading, that "lilo" might be left on your chroot, which could potentially cause nasty damage. + * added /var/cache/pbuilder/aptcache directory - -- Junichi Uekawa <dancer@debian.org> Sun, 23 Sep 2001 23:11:32 +0900 + -- Junichi Uekawa <dancer@debian.org> Mon, 24 Sep 2001 00:12:47 +0900 pbuilder (0.5) unstable; urgency=low diff --git a/debian/dirs b/debian/dirs index eb3c09d..eeabe70 100644 --- a/debian/dirs +++ b/debian/dirs @@ -3,4 +3,5 @@ usr/sbin usr/lib/pbuilder var/cache/pbuilder var/cache/pbuilder/result +var/cache/pbuilder/aptcache diff --git a/pbuilder-buildpackage b/pbuilder-buildpackage index 414539d..32f3047 100755 --- a/pbuilder-buildpackage +++ b/pbuilder-buildpackage @@ -162,9 +162,11 @@ if [ -n "$APTCACHE" ]; then fi echo Installing the build-deps checkbuilddep + if [ -n "$APTCACHE" ]; then echo "Copying back the cached apt archive contents" - for A in "$BUILDPLACE/var/cache/apt/archives/"*; do + mkdir -p "$APTCACHE" ; + for A in "$BUILDPLACE/var/cache/apt/archives/"*.deb; do if [ ! -f "$APTCACHE/"$(basename "$A") ]; then echo " -> new cache content "$(basename "$A")" added" cp "$A" "$APTCACHE/" |