Make cron script quiet if cache is locked. Closes: #459344

diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index ec53a7f2f73b10c92044df358e91211cfd4390d8..1ca830c930c5fbc40e8db288519f9b94c9f0994a 100644 (file)
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -193,9 +193,10 @@ if which on_ac_power >/dev/null; then
 fi
 
 # check if we can lock the cache and if the cache is clean
 fi
 
 # check if we can lock the cache and if the cache is clean

+# There's a reasonable chance that someone is already running an apt
+# frontend that has locked the cache, so exit quietly if it is locked.

 if ! apt-get check -q -q 2>/dev/null; then
 if ! apt-get check -q -q 2>/dev/null; then

-    echo "$0: could not lock the APT cache"
-    exit 1
+    exit 0

 fi
 
 # sleep random amount of time
 fi
 
 # sleep random amount of time

diff --git a/debian/changelog b/debian/changelog
index cba6920eb2e5f4ab2ebb6f3a2a401049bfd1525a..5728af4195c07a74ebae0e8d470918b862fd4239 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ apt (0.7.13) UNRELEASED; urgency=low
 
   * Add missing build-depends back from build-depends-indep field.
     Closes: #478231
 
   * Add missing build-depends back from build-depends-indep field.
     Closes: #478231

+  * Make cron script quiet if cache is locked. Thanks to Ted Percival
+    <ted@midg3t.net> for the patch. Closes: #459344

 
  -- Otavio Salvador <otavio@debian.org>  Fri, 02 May 2008 12:07:08 -0300
 
 
  -- Otavio Salvador <otavio@debian.org>  Fri, 02 May 2008 12:07:08 -0300