X-Git-Url: https://git.hcoop.net/ntk/apt.git/blobdiff_plain/a8cdfb5aaa972f8df0016381ea7ad1be5c38a3d1..c2d0fdd1abffa6701422f4b722b994ab3c43262b:/debian/apt.cron.daily

diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index b4cbf1c8..954f0bfc 100644
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -147,16 +147,44 @@ check_size_constraints()
     fi
 }
 
+# sleep for a random interval of time (default 30min)
+# (some code taken from cron-apt, thanks)
+random_sleep()
+{
+    RandomSleep=1800
+    eval $(apt-config shell RandomSleep APT::Periodic::RandomSleep)
+    if [ $RandomSleep -eq 0 ]; then
+	return
+    fi
+    if [ -z "$RANDOM" ] ; then
+        # A fix for shells that do not have this bash feature.
+	RANDOM=$(dd if=/dev/urandom count=1 2> /dev/null | cksum | cut -c"1-5")
+    fi
+    TIME=$(($RANDOM % $RandomSleep))
+    sleep $TIME
+}
+
+# main
+
+if ! which apt-config >/dev/null; then
+	exit 0
+fi
 
 UpdateInterval=0
 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::Autoclean)
-
+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
@@ -170,11 +198,49 @@ if which on_ac_power >/dev/null; then
     fi
 fi
 
+# sleep random amount of time to avoid hitting the 
+# mirrors at the same time
+random_sleep
+
+# check 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
+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 2>/dev/null)
+	host=$(sudo -u "$admin_user" gconftool --get /system/http_proxy/host 2>/dev/null)
+	port=$(sudo -u "$admin_user" gconftool --get /system/http_proxy/port 2>/dev/null)
+	if [ "$use" = "true" ] && [ -n "$host" ] && [ -n "$port" ]; then
+		export http_proxy="http://$host:$port/"
+	fi
+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
+	# now run apt-xapian-index if it is installed to ensure the index
+	# is up-to-date
+	if [ -x /usr/sbin/update-apt-xapian-index ]; then
+	    ionice -c3 update-apt-xapian-index -q
 	fi
         update_stamp $UPDATE_STAMP
     fi
@@ -186,17 +252,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