X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/69c28efc768e22029ba343f335dd198ac52b1eef..bb6dd359654f4debd9816cc27fd893a437eb66cd:/debian/apt.cron.daily?ds=inline diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index ec53a7f2f..a5c646d92 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -193,11 +193,31 @@ if which on_ac_power >/dev/null; then fi # check if we can lock the cache and if the cache is clean +# There's a reasonable chance that someone is already running an apt +# frontend that has locked the cache, so exit quietly if it is locked. +if ! apt-get check -q -q 2>/dev/null; then + exit 0 +fi + +# sleep random amount of time +random_sleep + +# check again if we can access the cache if ! apt-get check -q -q 2>/dev/null; then - echo "$0: could not lock the APT cache" exit 1 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) + host=$(sudo -u "$admin_user" gconftool --get /system/http_proxy/host) + port=$(sudo -u "$admin_user" gconftool --get /system/http_proxy/port) + if [ "$use" = "true" ] && [ -n "$host" ] && [ -n "$port" ]; then + export http_proxy="http://$host:$port/" + fi +fi + # sleep random amount of time random_sleep @@ -208,9 +228,15 @@ 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 + # 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 + dbus-send --system / app.apt.dbus.updated boolean:true 2>/dev/null || true fi update_stamp $UPDATE_STAMP fi