X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/f9b4616d1d9ef367454b5f773cfff74164c558ff..bb6dd359654f4debd9816cc27fd893a437eb66cd:/debian/apt.cron.daily

diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index 84d3afe1d..a5c646d92 100644
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -207,12 +207,37 @@ 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
-        if which dbus-send >/dev/null && pidof dbus-daemon >/dev/null; then
-            dbus-send --system / app.apt.dbus.updated boolean:true
-        fi
+    # 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
+	if which dbus-send >/dev/null; then
+	    dbus-send --system / app.apt.dbus.updated boolean:true 2>/dev/null || true
+	fi
         update_stamp $UPDATE_STAMP
     fi
 fi