* debian/apt.cron.daily:

[apt.git] / debian / apt.cron.daily

diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index a5c646d92f699d5280220d0bc50ce60e3423333e..bb72780a5463bbc057b6b775022b10d562eda109 100644 (file)
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -147,7 +147,7 @@ check_size_constraints()
     fi
 }
 
     fi
 }
 

-# sleep for a random intervall of time (default 30min)
+# sleep for a random interval of time (default 30min)

 # (some code taken from cron-apt, thanks)
 random_sleep()
 {
 # (some code taken from cron-apt, thanks)
 random_sleep()
 {


@@ -210,9 +210,9 @@ 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
 # 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)
-       host=$(sudo -u "$admin_user" gconftool --get /system/http_proxy/host)
-       port=$(sudo -u "$admin_user" gconftool --get /system/http_proxy/port)
+       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
        if [ "$use" = "true" ] && [ -n "$host" ] && [ -n "$port" ]; then
                export http_proxy="http://$host:$port/"
        fi