X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/bf1aaa6c9d989b328c031360658a8a0d592bc755..bb6dd359654f4debd9816cc27fd893a437eb66cd:/debian/apt.cron.daily?ds=inline

diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index 48714ec15..a5c646d92 100644
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -147,6 +147,28 @@ check_size_constraints()
     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
 
 UpdateInterval=0
 DownloadUpgradeableInterval=0
@@ -170,9 +192,46 @@ 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
+random_sleep
+
+# check again if we can access the cache
+if ! apt-get check -q -q 2>/dev/null; then
+    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)
+	if [ "$use" = "true" ] && [ -n "$host" ] && [ -n "$port" ]; then
+		export http_proxy="http://$host:$port/"
+	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
-    if apt-get -qq update 2>/dev/null; then
+    # check for a new archive signing key (against the master keyring)
+    apt-key net-update
+    # now run the update
+    if apt-get -qq update -o APT::Update::Auth-Failure::="cp /usr/share/apt/apt-auth-failure.note /var/lib/update-notifier/user.d/" 2>/dev/null; then 
 	# Could possible test access to '/var/run/dbus/system_bus_socket' has well,
 	# but I'm not sure how stable the internal pipe location is defined as
 	# being;  so for the moment just 2>/dev/null . --sladen 2007-09-27