From 4c2dcaa1dad933a6c5d8c3678ab5c3a913d01f4f Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 28 May 2008 15:16:35 +0200
Subject: * debian/apt.cron.daily:   - apply patch based on the ideas of
 Francesco Poli for better     behavior when the cache can not be locked
 (closes: #459344)

---
 debian/apt.cron.daily | 29 ++++++++++++++++++-----------
 debian/changelog      |  5 +++++
 2 files changed, 23 insertions(+), 11 deletions(-)

(limited to 'debian')

diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index 84d3afe1d..c358ef012 100644
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -175,10 +175,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 +198,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
diff --git a/debian/changelog b/debian/changelog
index 9dc7cf40f..bd129eec3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,11 @@ apt (0.7.14) UNRELEASED; urgency=low
   * Apply patch to avoid truncating of arbitrary files. Thanks to Bryan
     Donlan <bdonlan@fushizen.net> for the patch. Closes: #482476
   * Avoid using dbus if dbus-daemon isn't running. Closes: #438803
+  
+  [ Michael Vogt ]
+  * debian/apt.cron.daily:
+    - apply patch based on the ideas of Francesco Poli for better 
+      behavior when the cache can not be locked (closes: #459344)
 
  -- Christian Perrier <bubulle@debian.org>  Sun, 04 May 2008 08:31:06 +0200
 
-- 
cgit v1.2.3