* debian/apt.cron.daily:

  - use admin user proxy settings

diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index d1ee08a5cb3c0d3516416801d6e490e69fb15c79..1b54cdf1c3c70b511749cca6a2cb4a2f669952d0 100644 (file)
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -179,6 +179,16 @@ 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" ]; 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
 
 UPDATE_STAMP=/var/lib/apt/periodic/update-stamp
 if check_stamp $UPDATE_STAMP $UpdateInterval; then

diff --git a/debian/changelog b/debian/changelog
index 1e3a71dd3841140df1f67b6e153be710575c0a3a..3822c6a4eaa2cd81cfe56c581ecd152b8de8da04 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apt (0.7.9ubuntu11) hardy; urgency=low
+
+  * debian/apt.cron.daily:
+    - use admin user proxy settings
+
+ --
+
 apt (0.7.9ubuntu10) hardy; urgency=low
 
   * cmdline/apt-key: