diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2005-03-15 09:58:48 +0000 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2005-03-15 09:58:48 +0000 |
| commit | 01717245170c1fbb8080a9737f1da70877e302e8 (patch) | |
| tree | 32ffcacad71b95c2483f4aa9fdcd16e841ac3746 | |
| parent | 6cce801a21abb7aa11272e58aa17b6eee454322e (diff) | |
| parent | 5896abe8b78f376dc1a96c9cd4a920239c3bfee5 (diff) | |
* be more carefull when building the archive path (thanks to matt!)
Patches applied:
* apt@packages.debian.org/apt--main--0--patch-67
Open 0.6.35
* apt@packages.debian.org/apt--main--0--patch-68
Merge apt--mvo--0
* apt@packages.debian.org/apt--main--0--patch-69
Correct spelling in cron.daily
* apt@packages.debian.org/apt--main--0--patch-70
Use find|xargs rather than find -exec in cron.daily
* apt@packages.debian.org/apt--main--0--patch-71
Update changelog
| -rw-r--r-- | debian/apt.cron.daily | 12 | ||||
| -rw-r--r-- | debian/changelog | 8 |
2 files changed, 14 insertions, 6 deletions
diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 76c90c8bb..f3a1c736d 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -38,7 +38,7 @@ update_stamp() # we check here if autoclean was enough sizewise -check_size_constrains() +check_size_constraints() { # min-age in days MaxAge=0 @@ -47,6 +47,7 @@ check_size_constrains() CacheArchive="archives/" eval $(apt-config shell MaxAge APT::Archives::MaxAge) eval $(apt-config shell MaxSize APT::Archives::MaxSize) + eval $(apt-config shell Dir Dir) eval $(apt-config shell CacheDir Dir::Cache) eval $(apt-config shell CacheArchive Dir::Cache::archives) @@ -55,11 +56,12 @@ check_size_constrains() echo "empty Dir::Cache or Dir::Cache::archives, exiting" exit fi - Cache="/"$CacheDir$CacheArchive + + Cache="${Dir%/}/${CacheDir%/}/${CacheArchive%/}/" # check age if [ ! $MaxAge -eq 0 ]; then - find $Cache -name "*.deb" -mtime +$MaxAge -exec rm -f {} \; + find $Cache -name "*.deb" -mtime +$MaxAge -print0 | xargs -r -0 rm -f fi # check size @@ -78,8 +80,6 @@ check_size_constrains() fi } -check_size_constrains - UpdateInterval=0 DownloadUpgradeableInterval=0 eval $(apt-config shell UpdateInterval APT::Periodic::Update-Package-Lists DownloadUpgradeableInterval APT::Periodic::Download-Upgradeable-Packages) @@ -117,6 +117,6 @@ fi AUTOCLEAN_STAMP=/var/lib/apt/periodic/autoclean-stamp if check_stamp $AUTOCLEAN_STAMP $AutocleanInterval; then apt-get -qq autoclean - check_size_contrains + check_size_constraints update_stamp $AUTOCLEAN_STAMP fi diff --git a/debian/changelog b/debian/changelog index 9a2ad132f..2b093b0dc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.6.35) hoary; urgency=low + + * Merge apt--mvo--0: + - Implement MaxSize and MaxAge in apt.cron.daily, to prevent the cache + from growing too large (Ubuntu #6761) + + -- Matt Zimmerman <mdz@ubuntu.com> Mon, 7 Mar 2005 20:08:33 -0800 + apt (0.6.34) hoary; urgency=low * Add missing semicolon to configure-index (Closes: #295773) |