summaryrefslogtreecommitdiff
path: root/debian/apt.postinst
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2010-07-29 16:18:10 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2010-07-29 16:18:10 +0200
commit15240f4b681ca35c669d2b2e6e34f8ee3f6c06d9 (patch)
tree4139050e3c2f00650a0d316c971c4e7b8aba3e58 /debian/apt.postinst
parent34904390bd6901f3de90249938baa0b875873534 (diff)
parent1b8ba3ba050f01db27f1ddc0e5b280b2fccd9fb9 (diff)
merged with the debian-experimental-ma branch
Diffstat (limited to 'debian/apt.postinst')
-rw-r--r--debian/apt.postinst37
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)