summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2008-02-20 22:05:24 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2008-02-20 22:05:24 +0100
commit1fdd4ac46faf85127aa923ef16220f8951f3f182 (patch)
tree6678283e26c12021a1c5d640204fa4962186e668
parent1bc5d775b911e64e2f1e9e12539496ce13dd0945 (diff)
* debian/apt.cron.daily:
- use admin user proxy settings
-rw-r--r--debian/apt.cron.daily10
-rw-r--r--debian/changelog7
2 files changed, 17 insertions, 0 deletions
diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index d1ee08a5c..1b54cdf1c 100644
--- 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 1e3a71dd3..3822c6a4e 100644
--- 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: