* fix FTBFS with gcc 4.3, closes: #417090

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

diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index 7ee7e46db947ee9f42da4a8b8376b6c456234593..4d6bf5842f0394aab8747a069694b1a9b4a81b9c 100644 (file)
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -74,7 +74,7 @@ check_size_constraints()
 {
     # min-age in days
     MaxAge=0
-    MinAge=1
+    MinAge=2
     MaxSize=0
     CacheDir="var/cache/apt"
     CacheArchive="archives/"
@@ -95,9 +95,9 @@ check_size_constraints()
 
     # check age
     if [ ! $MaxAge -eq 0 ] && [ ! $MinAge -eq 0 ]; then
-       find $Cache -name "*.deb"  -mtime +$MaxAge -and -not -mtime -$MinAge -print0 | xargs -r -0 rm -f
+       find $Cache -name "*.deb"  \( -mtime +$MaxAge -and -ctime +$MaxAge \) -and -not \( -mtime -$MinAge -or -ctime -$MinAge \) -print0 | xargs -r -0 rm -f
     elif [ ! $MaxAge -eq 0 ]; then
-       find $Cache -name "*.deb"  -mtime +$MaxAge -print0 | xargs -r -0 rm -f
+       find $Cache -name "*.deb"  -ctime +$MaxAge -and -mtime +$MaxAge -print0 | xargs -r -0 rm -f
     fi
     
     # check size
@@ -110,7 +110,7 @@ check_size_constraints()
        MinAge=$(($MinAge*24*60*60))
 
        # reverse-sort by mtime
-       for file in $(ls -rt $Cache/*.deb); do 
+       for file in $(ls -rt $Cache/*.deb 2>/dev/null); do 
            du=$(du -s $Cache)
            size=${du%%/*}
            # check if the cache is small enough
@@ -120,12 +120,18 @@ check_size_constraints()
 
            # check for MinAge of the file
            if [ ! $MinAge -eq 0 ]; then 
-               mtime=$(date --date=$(date -r $file --iso-8601) +%s)
-               delta=$(($now-$mtime))
+               # check both ctime and mtime 
+               mtime=$(stat -c %Y $file)
+               ctime=$(stat -c %Z $file)
+               if [ $mtime -gt $ctime ]; then
+                   delta=$(($now-$mtime))
+               else
+                   delta=$(($now-$ctime))
+               fi
                #echo "$file ($delta), $MinAge"
                if [ $delta -le $MinAge ]; then
                    #echo "Skiping $file (delta=$delta)"
-                   continue
+                   break
                fi
            fi
 
@@ -140,7 +146,7 @@ UpdateInterval=0
 DownloadUpgradeableInterval=0
 eval $(apt-config shell UpdateInterval APT::Periodic::Update-Package-Lists DownloadUpgradeableInterval APT::Periodic::Download-Upgradeable-Packages)
 AutocleanInterval=$DownloadUpgradeableInterval
-eval $(apt-config shell AutocleanInterval APT::Periodic::Autoclean)
+eval $(apt-config shell AutocleanInterval APT::Periodic::AutocleanInterval)
 
 # laptop check, on_ac_power returns:
 #       0 (true)    System is on mains power