methods/makefile: remove duplicated entry for https

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

diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index 127ecf47d8817dbf88255e6067f8441cc5599ba5..d1016dfc5d5cbde8853871891504874f92b8e8b0 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
@@ -158,10 +161,6 @@ UnattendedUpgradeInterval=0
 eval $(apt-config shell UnattendedUpgradeInterval APT::Periodic::Unattended-Upgrade)
 
 
-UnattendedUpgradeInterval=0
-eval $(apt-config shell UnattendedUpgradeInterval APT::Periodic::Unattended-Upgrade)
-
-
 # laptop check, on_ac_power returns:
 #       0 (true)    System is on mains power
 #       1 (false)   System is not on mains power
@@ -174,11 +173,21 @@ 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
+       # 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
@@ -190,17 +199,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