Merge with Matt

[apt.git] / debian / apt.cron.daily

diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index 5145a5d2f52707b1fe888837f8cc98a81bcd826f..1d830260b82c50f9b2e6859bd4abb268c61ebc4b 100644 (file)
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -69,6 +69,51 @@ update_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
+
+
+
 # we check here if autoclean was enough sizewise
 check_size_constraints()
 {
@@ -173,6 +218,7 @@ 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