* Apply patch to avoid truncating of arbitrary files. Thanks to Bryan

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

diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index b0164a576c30d3967c419c9777fc8552df05024d..a5c646d92f699d5280220d0bc50ce60e3423333e 100644 (file)
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -193,14 +193,23 @@ if which on_ac_power >/dev/null; then
 fi
 
 # check if we can lock the cache and if the cache is clean
 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
 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)
     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" ]; then
+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)
        host=$(sudo -u "$admin_user" gconftool --get /system/http_proxy/host)
        port=$(sudo -u "$admin_user" gconftool --get /system/http_proxy/port)