Merge lp:~jibel/apt/bug.579647 into lp:~ubuntu-core-dev/apt/ubuntu

[Michael Vogt]

[Michael Vogt (mvo)]

Many thanks for the branch! I merged it with a minor modification and uploaded it to lucid-proposed.

=== modified file 'debian/apt.postinst'
--- debian/apt.postinst	2010-05-14 07:42:05 +0000
+++ debian/apt.postinst	2010-05-14 07:51:30 +0000
@@ -5,6 +5,7 @@
 # set the proxy based on the admin users gconf settings 
 # 
 set_apt_proxy_from_gconf() {
+<<<<<<< TREE
     # try SUDO_USER first
     if [ -n "$SUDO_USER" ]; then
         admin_user="$SUDO_USER"
@@ -28,6 +29,27 @@
 	        echo "Acquire::http::proxy \"http://$host:$port/\";" >> /etc/apt/apt.conf
 	    fi
 	fi
+=======
+    if [ ! -n "$SUDO_USER" ]; then
+        admin_user="$SUDO_USER"
+    else
+        admin_user=$(getent group admin|cut -d: -f4|cut -d, -f1)
+    fi
+
+    if id -u "$admin_user" > /dev/null 2>&1; then
+        if [ -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) || true
+        host=$(sudo -u "$admin_user" gconftool --get /system/http_proxy/host 2>/dev/null) || true
+        port=$(sudo -u "$admin_user" gconftool --get /system/http_proxy/port 2>/dev/null) || true
+        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
+>>>>>>> MERGE-SOURCE
     fi
 }