diff options
Diffstat (limited to 'debian/apt.postinst')
| -rw-r--r-- | debian/apt.postinst | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/debian/apt.postinst b/debian/apt.postinst index cc0d8b1fe..6236acd42 100644 --- a/debian/apt.postinst +++ b/debian/apt.postinst @@ -2,6 +2,24 @@ set -e +# set the proxy based on the admin users gconf settings +# +set_apt_proxy_from_gconf() { + 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 + APT_CONF_PROXY="" + eval $(apt-config shell APT_CONF_PROXY Acquire::http::proxy) + if [ -z "$APT_CONF_PROXY" ]; then + echo "Acquire::http::proxy \"http://$host:$port/\";" >> /etc/apt/apt.conf + fi + fi + fi +} + # summary of how this script can be called: # * <postinst> `configure' <most-recently-configured-version> # * <old-postinst> `abort-upgrade' <new version> @@ -15,7 +33,16 @@ set -e case "$1" in configure) - apt-key update + if ! test -f /etc/apt/trusted.gpg; then + cp /usr/share/apt/ubuntu-archive.gpg /etc/apt/trusted.gpg + fi + + # mvo: get gconf defaults once and write to a file, reason is + # that sudo no longer honors http_proxy + # this can be removed after lucid is released + if dpkg --compare-versions "$2" lt-nl "0.7.25.3ubuntu2"; then + set_apt_proxy_from_gconf + fi ;; abort-upgrade|abort-remove|abort-deconfigure) |