From 6e22dc81c193338d804839e7b30ce937d292149e Mon Sep 17 00:00:00 2001 From: Matt Zimmerman Date: Tue, 8 Mar 2005 04:08:51 +0000 Subject: Open 0.6.35 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 9a2ad132f..39e528801 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +apt (0.6.35) UNRELEASED; urgency=low + + * + + -- Matt Zimmerman Mon, 7 Mar 2005 20:08:33 -0800 + apt (0.6.34) hoary; urgency=low * Add missing semicolon to configure-index (Closes: #295773) -- cgit v1.2.3 From 6cce801a21abb7aa11272e58aa17b6eee454322e Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 14 Mar 2005 13:20:01 +0000 Subject: * add APT::Archives::{MaxAge,MaxSize} to the cron.daily apt script --- debian/apt.cron.daily | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 3e6b384d2..76c90c8bb 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_constrains() +{ + # 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 -exec 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_constrains + 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 -- cgit v1.2.3 From 2e8a92e5cade0517b65e8ed2f79c24f7acde6096 Mon Sep 17 00:00:00 2001 From: Matt Zimmerman Date: Mon, 14 Mar 2005 21:06:43 +0000 Subject: Correct spelling in cron.daily --- debian/apt.cron.daily | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 76c90c8bb..ffc7044d1 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 @@ -78,7 +78,7 @@ check_size_constrains() fi } -check_size_constrains +check_size_constraints UpdateInterval=0 DownloadUpgradeableInterval=0 -- cgit v1.2.3 From 60ea46b25524b7b48f6518306a535d86f1e7676c Mon Sep 17 00:00:00 2001 From: Matt Zimmerman Date: Mon, 14 Mar 2005 21:09:25 +0000 Subject: Use find|xargs rather than find -exec in cron.daily --- debian/apt.cron.daily | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index ffc7044d1..982a35d74 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -59,7 +59,7 @@ check_size_constraints() # 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 -- cgit v1.2.3 From 5896abe8b78f376dc1a96c9cd4a920239c3bfee5 Mon Sep 17 00:00:00 2001 From: Matt Zimmerman Date: Mon, 14 Mar 2005 21:10:18 +0000 Subject: Update changelog --- debian/changelog | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 39e528801..2b093b0dc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ -apt (0.6.35) 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 Mon, 7 Mar 2005 20:08:33 -0800 -- cgit v1.2.3