diff options
Diffstat (limited to 'debian/apt.cron.daily')
| -rw-r--r-- | debian/apt.cron.daily | 62 |
1 files changed, 40 insertions, 22 deletions
diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 32fbafc57..f4eb6117a 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -175,16 +175,10 @@ DownloadUpgradeableInterval=0 eval $(apt-config shell UpdateInterval APT::Periodic::Update-Package-Lists DownloadUpgradeableInterval APT::Periodic::Download-Upgradeable-Packages) AutocleanInterval=$DownloadUpgradeableInterval eval $(apt-config shell AutocleanInterval APT::Periodic::AutocleanInterval) + UnattendedUpgradeInterval=0 eval $(apt-config shell UnattendedUpgradeInterval APT::Periodic::Unattended-Upgrade) -# check if we actually have to do anything -if [ $UpdateInterval -eq 0 ] && - [ $DownloadUpgradeableInterval -eq 0 ] && - [ $UnattendedUpgradeInterval -eq 0 ] && - [ $AutocleanInterval -eq 0 ]; then - exit 0 -fi # laptop check, on_ac_power returns: # 0 (true) System is on mains power @@ -198,28 +192,52 @@ if which on_ac_power >/dev/null; then fi fi -# sleep random amount of time to avoid hitting the -# mirrors at the same time +# 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 if we can access the cache +# check again if we can access the cache if ! apt-get check -q -q 2>/dev/null; then - # wait random amount of time before retrying - 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 - fi + 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 + +# check again if we can access the cache +if ! apt-get check -q -q 2>/dev/null; then + exit 1 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 update_stamp $UPDATE_STAMP fi fi |