merged from apt--mvo

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

diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index 778e3cefefb9da48091f95aae9d6db9e91b18b83..d1ee08a5cb3c0d3516416801d6e490e69fb15c79 100644 (file)
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -147,6 +147,9 @@ check_size_constraints()
     fi
 }
 
+if ! which apt-config >/dev/null; then
+       exit 0
+fi
 
 UpdateInterval=0
 DownloadUpgradeableInterval=0
@@ -170,11 +173,24 @@ if which on_ac_power >/dev/null; then
     fi
 fi
 
+# check if we can lock the cache and if the cache is clean
+if ! apt-get check -q -q 2>/dev/null; then
+    echo "$0: could not lock the APT cache"
+    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
+    # 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
@@ -186,17 +202,17 @@ if check_stamp $DOWNLOAD_UPGRADEABLE_STAMP $DownloadUpgradeableInterval; then
     update_stamp $DOWNLOAD_UPGRADEABLE_STAMP
 fi
 
-AUTOCLEAN_STAMP=/var/lib/apt/periodic/autoclean-stamp
-if check_stamp $AUTOCLEAN_STAMP $AutocleanInterval; then
-    apt-get -qq autoclean
-    update_stamp $AUTOCLEAN_STAMP
-fi
-
 UPGRADE_STAMP=/var/lib/apt/periodic/upgrade-stamp
 if check_stamp $UPGRADE_STAMP $UnattendedUpgradeInterval; then
     unattended-upgrade
     update_stamp $UPGRADE_STAMP
 fi
 
+AUTOCLEAN_STAMP=/var/lib/apt/periodic/autoclean-stamp
+if check_stamp $AUTOCLEAN_STAMP $AutocleanInterval; then
+    apt-get -qq autoclean
+    update_stamp $AUTOCLEAN_STAMP
+fi
+
 # check cache size 
 check_size_constraints