diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2010-07-30 19:29:44 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2010-07-30 19:29:44 +0200 |
| commit | a521ca5d3fc6619529843779ea46500fa6e69e14 (patch) | |
| tree | d6134e25dad5550e75768f8c9fbaabe75d81e541 /debian/apt.postinst | |
| parent | 34904390bd6901f3de90249938baa0b875873534 (diff) | |
| parent | 7abfcfbe8518d1b5cc79e967c3ac16c2f783d6ea (diff) | |
merged from experimental-apt-for-ubuntu
Diffstat (limited to 'debian/apt.postinst')
| -rw-r--r-- | debian/apt.postinst | 37 |
1 files changed, 1 insertions, 36 deletions
diff --git a/debian/apt.postinst b/debian/apt.postinst index 4f14703d0..34545468e 100644 --- a/debian/apt.postinst +++ b/debian/apt.postinst @@ -2,35 +2,6 @@ set -e -# set the proxy based on the admin users gconf settings -# -set_apt_proxy_from_gconf() { - # try SUDO_USER first - if [ -n "$SUDO_USER" ]; then - admin_user="$SUDO_USER" - else - admin_user=$(getent group admin|cut -d: -f4|cut -d, -f1) - fi - # test if the user actually exists, getent returns "+" for e.g. - # LDAP - if ! id -u "$admin_user" > /dev/null 2>&1; then - return - fi - # get the settings from gconf - 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> @@ -47,13 +18,7 @@ case "$1" in 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 || true - fi + apt-key update ;; abort-upgrade|abort-remove|abort-deconfigure) |