diff options
Diffstat (limited to 'debian/apt.cron.daily')
| -rw-r--r-- | debian/apt.cron.daily | 36 |
1 files changed, 29 insertions, 7 deletions
diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 5c5ca88c7..7f2978568 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -225,18 +225,40 @@ if ! apt-get check -q -q 2>/dev/null; then random_sleep # check again if ! apt-get check -q -q 2>/dev/null; then - echo "$0: could not lock the APT cache while performing daily cron job. " - echo "Is another package manager working?" - exit 1 + echo "$0: could not lock the APT cache while performing daily cron job. " + echo "Is another package manager working?" + exit 1 fi 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 + 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 +fi + UPDATE_STAMP=/var/lib/apt/periodic/update-stamp if check_stamp $UPDATE_STAMP $UpdateInterval; then - if apt-get -qq update 2>/dev/null; then - if which dbus-send >/dev/null && pidof dbus-daemon >/dev/null; then - dbus-send --system / app.apt.dbus.updated boolean:true - fi + # check for a new archive signing key (against the master keyring) + apt-key net-update + # now run the update + if apt-get -qq update -o APT::Update::Auth-Failure::="cp /usr/share/apt/apt-auth-failure.note /var/lib/update-notifier/user.d/" 2>/dev/null; then + # Could possible test access to '/var/run/dbus/system_bus_socket' has well, + # but I'm not sure how stable the internal pipe location is defined as + # being; so for the moment just 2>/dev/null . --sladen 2007-09-27 + if which dbus-send >/dev/null; then + dbus-send --system / app.apt.dbus.updated boolean:true 2>/dev/null || true + fi + # now run apt-xapian-index if it is installed to ensure the index + # is up-to-date + if [ -x /usr/sbin/update-apt-xapian-index ]; then + ionice -c3 update-apt-xapian-index -q + fi update_stamp $UPDATE_STAMP fi fi |