* 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 1b54cdf1c3c70b511749cca6a2cb4a2f669952d0..a5c646d92f699d5280220d0bc50ce60e3423333e 100644 (file)
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -147,6 +147,25 @@ check_size_constraints()
     fi
 }
 
     fi
 }
 

+# sleep for a random intervall of time (default 30min)
+# (some code taken from cron-apt, thanks)
+random_sleep()
+{
+    RandomSleep=1800
+    eval $(apt-config shell RandomSleep APT::Periodic::RandomSleep)
+    if [ $RandomSleep -eq 0 ]; then
+       return
+    fi
+    if [ -z "$RANDOM" ] ; then
+        # A fix for shells that do not have this bash feature.
+       RANDOM=$(dd if=/dev/urandom count=1 2> /dev/null | cksum | cut -c"1-5")
+    fi
+    TIME=$(($RANDOM % $RandomSleep))
+    sleep $TIME
+}
+
+# main
+

 if ! which apt-config >/dev/null; then
        exit 0
 fi
 if ! which apt-config >/dev/null; then
        exit 0
 fi


@@ -174,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)


@@ -190,6 +218,14 @@ if [ -n "$admin_user" ] && [ -x /usr/bin/sudo ] && [ -z "$http_proxy" ]; then
        fi
 fi
 
        fi
 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
+    exit 1
+fi
+

 UPDATE_STAMP=/var/lib/apt/periodic/update-stamp
 if check_stamp $UPDATE_STAMP $UpdateInterval; then
     # check for a new archive signing key (against the master keyring)
 UPDATE_STAMP=/var/lib/apt/periodic/update-stamp
 if check_stamp $UPDATE_STAMP $UpdateInterval; then
     # check for a new archive signing key (against the master keyring)