* debian/apt.cron.daily:

  - only run the cron job if apt-get check succeeds (LP: #131719)

diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index 48714ec15d50780b6d330c239e1e4c1811b7af1d..4f7eff47bf7310e52126343a14d873c504c62c72 100644 (file)
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -170,6 +170,12 @@ 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
+    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

diff --git a/debian/changelog b/debian/changelog
index 7213c6773a7aadbd2dc15f82d87bc6fd6c3e3e44..79efaf1a6f901414e5105bef6cfd4cb1f976ce47 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apt (0.7.6ubuntu14) gutsy; urgency=low
+
+  * debian/apt.cron.daily:
+    - only run the cron job if apt-get check succeeds (LP: #131719)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 12 Oct 2007 17:56:22 +0200
+
 apt (0.7.6ubuntu13) gutsy; urgency=low
 
   * apt-pkg/deb/dpkgpm.cc: