X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/f9b4616d1d9ef367454b5f773cfff74164c558ff..6e7c6c3f58193fd5db3d9d598ac65a1571522a58:/debian/apt.cron.daily

diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index 84d3afe1d..b40bb2c30 100644
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -50,8 +50,25 @@ check_stamp()
     fi
 
     # compare midnight today to midnight the day the stamp was updated
-    stamp=$(date --date=$(date -r $stamp --iso-8601) +%s)
-    now=$(date --date=$(date --iso-8601) +%s)
+    stamp_file="$stamp"
+    stamp=$(date --date=$(date -r $stamp_file --iso-8601) +%s 2>/dev/null)
+    if [ "$?" != "0" ]; then
+        # Due to some timezones returning 'invalid date' for midnight on
+        # certain dates (eg America/Sao_Paulo), if date returns with error
+        # remove the stamp file and return 0. See coreutils bug:
+        # http://lists.gnu.org/archive/html/bug-coreutils/2007-09/msg00176.html
+        rm -f "$stamp_file"
+        return 0
+    fi
+
+    now=$(date --date=$(date --iso-8601) +%s 2>/dev/null)
+    if [ "$?" != "0" ]; then
+        # As above, due to some timezones returning 'invalid date' for midnight
+        # on certain dates (eg America/Sao_Paulo), if date returns with error
+        # return 0.
+        return 0
+    fi
+
     delta=$(($now-$stamp))
 
     # intervall is in days,
@@ -59,6 +76,13 @@ check_stamp()
     #echo "stampfile: $1"
     #echo "interval=$interval, now=$now, stamp=$stamp, delta=$delta"
 
+    # remove timestamps a day (or more) in the future and force re-check
+    if [ $stamp -gt $(($now+86400)) ]; then
+         echo "WARNING: file $stamp_file has a timestamp in the future: $stamp"
+         rm -f "$stamp_file"
+         return 0
+    fi
+
     if [ $delta -ge $interval ]; then
         return 0
     fi
@@ -147,7 +171,7 @@ check_size_constraints()
     fi
 }
 
-# sleep for a random intervall of time (default 30min)
+# sleep for a random interval of time (default 30min)
 # (some code taken from cron-apt, thanks)
 random_sleep()
 {
@@ -175,10 +199,16 @@ 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::AutocleanInterval)
-
 UnattendedUpgradeInterval=0
 eval $(apt-config shell UnattendedUpgradeInterval APT::Periodic::Unattended-Upgrade)
 
+# check if we actually have to do anything
+if [ $UpdateInterval -eq 0 ] &&
+   [ $DownloadUpgradeableInterval -eq 0 ] &&
+   [ $UnattendedUpgradeInterval -eq 0 ] &&
+   [ $AutocleanInterval -eq 0 ]; then
+    exit 0
+fi
 
 # laptop check, on_ac_power returns:
 #       0 (true)    System is on mains power
@@ -192,19 +222,20 @@ if which on_ac_power >/dev/null; then
     fi
 fi
 
-# check if we can lock the cache and if the cache is clean
-# There's a reasonable chance that someone is already running an apt
-# frontend that has locked the cache, so exit quietly if it is locked.
-if ! apt-get check -q -q 2>/dev/null; then
-    exit 0
-fi
-
-# sleep random amount of time
+# sleep random amount of time to avoid hitting the 
+# mirrors at the same time
 random_sleep
 
-# check again if we can access the cache
+# check if we can access the cache
 if ! apt-get check -q -q 2>/dev/null; then
-    exit 1
+    # wait random amount of time before retrying
+    random_sleep
+    # check again
+    if ! apt-get check -q -q 2>/dev/null; then
+	echo "$0: could not lock the APT cache while performing daily cron job. "
+	echo "Is another package manager working?"
+	exit 1
+    fi
 fi
 
 UPDATE_STAMP=/var/lib/apt/periodic/update-stamp