* debian/apt.cron.daily:

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

diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index 2f1a597442e974390cdb8a00a4bb2c968ae8ba41..bb72780a5463bbc057b6b775022b10d562eda109 100644 (file)
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -147,7 +147,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()
 {
@@ -193,17 +193,26 @@ 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
 
 # set the proxy based on the admin users gconf settings
 admin_user=$(getent group admin|cut -d: -f4|cut -d, -f1)
 if [ -n "$admin_user" ] && [ -x /usr/bin/sudo ] && [ -z "$http_proxy" ] && [ -x /usr/bin/gconftool ]; then
-       use=$(sudo -u "$admin_user" gconftool --get /system/http_proxy/use_http_proxy)
-       host=$(sudo -u "$admin_user" gconftool --get /system/http_proxy/host)
-       port=$(sudo -u "$admin_user" gconftool --get /system/http_proxy/port)
+       use=$(sudo -u "$admin_user" gconftool --get /system/http_proxy/use_http_proxy 2>/dev/null)
+       host=$(sudo -u "$admin_user" gconftool --get /system/http_proxy/host 2>/dev/null)
+       port=$(sudo -u "$admin_user" gconftool --get /system/http_proxy/port 2>/dev/null)
        if [ "$use" = "true" ] && [ -n "$host" ] && [ -n "$port" ]; then
                export http_proxy="http://$host:$port/"
        fi