diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2010-03-12 22:33:35 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2010-03-12 22:33:35 +0100 |
| commit | 553769ba6dab6b13c1235e898edd23cb62a00092 (patch) | |
| tree | 0c2b3de8f257792f3f48925deeac95029827f9a1 /debian/apt.cron.daily | |
| parent | d92dd27135d8a26793d3ad28534f2aaeb5fc7680 (diff) | |
* debian/apt.cron.daily:
- do not look into admin users gconf anymore for the http proxy
the user now needs to use the "Apply system-wide" UI in the
gnome-control-center to set it
* debian/apt.postinst:
- add set_apt_proxy_from_gconf() and run that once on upgrade if
there is no proxy configured already system-wide (LP: #432631)
From that point on gnome-control-center will have to warn if
the user makes changes to the proxy settings and does not apply
them system wide
Diffstat (limited to 'debian/apt.cron.daily')
| -rw-r--r-- | debian/apt.cron.daily | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index aa7b18886..8e46651b2 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -429,18 +429,6 @@ if [ $UpdateInterval -eq 0 ] && exit 0 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 2>/dev/null) - host=$(sudo -u "$admin_user" gconftool --get /system/http_proxy/host 2>/dev/null) - port=$(sudo -u "$admin_user" gconftool --get /system/http_proxy/port 2>/dev/null) - if [ "$use" = "true" ] && [ -n "$host" ] && [ -n "$port" ]; then - export http_proxy="http://$host:$port/" - fi -fi - - # deal with BackupArchiveInterval do_cache_backup $BackupArchiveInterval |