From f9b4616d1d9ef367454b5f773cfff74164c558ff Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 28 May 2008 14:06:13 +0200
Subject: debian/apt.cron.daily: test for both existance of dbus-send and if
 dbus-daemon is actually running

---
 debian/apt.cron.daily | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'debian/apt.cron.daily')

diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index a87fca79b..84d3afe1d 100644
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -210,7 +210,7 @@ fi
 UPDATE_STAMP=/var/lib/apt/periodic/update-stamp
 if check_stamp $UPDATE_STAMP $UpdateInterval; then
     if apt-get -qq update 2>/dev/null; then
-        if pidof dbus-daemon >/dev/null; then
+        if which dbus-send >/dev/null && pidof dbus-daemon >/dev/null; then
             dbus-send --system / app.apt.dbus.updated boolean:true
         fi
         update_stamp $UPDATE_STAMP
-- 
cgit v1.2.3


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 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

(limited to 'debian/apt.cron.daily')

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
-- 
cgit v1.2.3