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 5524c16eef0482eeeb6ae49c3690bd6103327783..d1016dfc5d5cbde8853871891504874f92b8e8b0 100644 (file)
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -147,6 +147,9 @@ check_size_constraints()
     fi
 }
 
     fi
 }
 

+if ! which apt-config >/dev/null; then
+       exit 0
+fi

 
 UpdateInterval=0
 DownloadUpgradeableInterval=0
 
 UpdateInterval=0
 DownloadUpgradeableInterval=0


@@ -172,6 +175,7 @@ fi
 
 # check if we can lock the cache and if the cache is clean
 if ! apt-get check -q -q 2>/dev/null; then
 
 # 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
 
     exit 1
 fi
 


@@ -179,8 +183,11 @@ 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
 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
        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
        fi
         update_stamp $UPDATE_STAMP
     fi