merged from debian

1 files changed, 10 insertions, 1 deletions

diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index 2f1a59744..a5c646d92 100644
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -193,8 +193,17 @@ if which on_ac_power >/dev/null; then
 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
+random_sleep
+
+# check again if we can access the cache
 if ! apt-get check -q -q 2>/dev/null; then
-    echo "$0: could not lock the APT cache"
     exit 1
 fi