diff options
| author | Christian Perrier <bubulle@debian.org> | 2005-03-28 14:08:45 +0000 |
|---|---|---|
| committer | Christian Perrier <bubulle@debian.org> | 2005-03-28 14:08:45 +0000 |
| commit | e8044cfac86e388d2b894d497be256b82bda52d6 (patch) | |
| tree | b2ea53445d4c51dea381ef4dfc53f714459a6dd0 | |
| parent | aa46370467a486d7b8b0ddbc80cea00a769d676e (diff) | |
| parent | 5896abe8b78f376dc1a96c9cd4a920239c3bfee5 (diff) | |
Sync with Matt
Patches applied:
* apt@packages.debian.org/apt--main--0--patch-66
Merge from bubulle@debian.org--2005/apt--main--0 (translations)
* 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
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-7
* sync with matt again
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-8
* add APT::Archives::{MaxAge,MaxSize} to the cron.daily apt script
| -rw-r--r-- | debian/apt.cron.daily | 46 | ||||
| -rw-r--r-- | debian/changelog | 12 |
2 files changed, 57 insertions, 1 deletions
diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 3e6b384d2..982a35d74 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -35,6 +35,51 @@ update_stamp() touch $stamp } + + +# we check here if autoclean was enough sizewise +check_size_constraints() +{ + # min-age in days + MaxAge=0 + MaxSize=0 + CacheDir="var/cache/apt" + CacheArchive="archives/" + eval $(apt-config shell MaxAge APT::Archives::MaxAge) + eval $(apt-config shell MaxSize APT::Archives::MaxSize) + eval $(apt-config shell CacheDir Dir::Cache) + eval $(apt-config shell CacheArchive Dir::Cache::archives) + + # sanity check + if [ -z "$CacheDir" -o -z "$CacheArchive" ]; then + echo "empty Dir::Cache or Dir::Cache::archives, exiting" + exit + fi + Cache="/"$CacheDir$CacheArchive + + # check age + if [ ! $MaxAge -eq 0 ]; then + find $Cache -name "*.deb" -mtime +$MaxAge -print0 | xargs -r -0 rm -f + fi + + # check size + if [ ! $MaxSize -eq 0 ]; then + # reverse-sort by mtime + for file in $(ls -rt $Cache/*.deb); do + du=$(du -s $Cache) + size=${du%%/*} + # check if the cache is small enough + if [ $size -lt $MaxSize ]; then + break + fi + # delete oldest file + rm -f $file + done + fi +} + +check_size_constraints + UpdateInterval=0 DownloadUpgradeableInterval=0 eval $(apt-config shell UpdateInterval APT::Periodic::Update-Package-Lists DownloadUpgradeableInterval APT::Periodic::Download-Upgradeable-Packages) @@ -72,5 +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 update_stamp $AUTOCLEAN_STAMP fi diff --git a/debian/changelog b/debian/changelog index 70aa27365..2b093b0dc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,17 @@ -apt (0.6.34) UNRELEASED; urgency=low +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) * Update build-depends on gettext to 0.12 (Closes: #295077) + * Merge from bubulle@debian.org--2005/apt--main--0 to get + translation updates -- Matt Zimmerman <mdz@ubuntu.com> Fri, 4 Mar 2005 16:13:15 -0800 |