* debian/apt.conf.daily:

  - print warning if the cache can not be locked (closes: #454561),
    thanks to Bastian Kleineidam

diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index 5524c16eef0482eeeb6ae49c3690bd6103327783..1d4df56b63ccd7a06f3633cc01d56e33ed3ec104 100644 (file)
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -172,6 +172,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
+    echo "$0: could not lock the APT cache"
     exit 1
 fi
 

diff --git a/debian/changelog b/debian/changelog
index 832ee11d43f764be769b721c6d30616ff8bded45..3154720e511a607ba7bf00321394ca32300b4559 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,8 +18,11 @@ apt (0.7.10) unstable; urgency=low
   [ Michael Vogt ]
   * debian/rules
     - fix https install location
+  * debian/apt.conf.daily:
+    - print warning if the cache can not be locked (closes: #454561),
+      thanks to Bastian Kleineidam
 
- -- Michael Vogt <mvo@debian.org>  Wed, 28 Nov 2007 17:10:49 +0100
+ -- Michael Vogt <mvo@debian.org>  Thu, 06 Dec 2007 14:38:31 +0100
 
 apt (0.7.9) unstable; urgency=low
 

diff --git a/test/pre-upload-check.py b/test/pre-upload-check.py
index 373683360cfda6de75bed8d0ac4fa3540f8ff749..268b3d6720a321093faad41a6e6b35bfb7d5b8e4 100755 (executable)
--- a/test/pre-upload-check.py
+++ b/test/pre-upload-check.py
@@ -120,22 +120,6 @@ class testLocalRepositories(unittest.TestCase):
             self.assert_(os.path.exists(os.path.join(self.repo,"Packages.gz")),
                          "Packages.gz vanished from local repo")
 
-    def testLocalRepo2(self):
-        repo = os.path.abspath(os.path.join(os.getcwd(), self.repo_dir+"2"))
-        sources = os.path.join(self.repo, "sources.list")
-        s = open(sources,"w")
-        s.write("deb file://%s/ /\n" % repo)
-        s.close()
-
-        # two times to get at least one i-m-s hit
-        for i in range(2):
-            self.assert_(os.path.exists(sources))
-            cmd = [self.apt,"update","-o", "Dir::Etc::sourcelist=%s" % sources]+apt_args
-            res = call(cmd, stdout=stdout, stderr=stderr)
-            self.assertEqual(res, 0, "local repo2 test failed")
-            self.assert_(os.path.exists(os.path.join(repo,"Packages.gz")),
-                         "Packages.gz vanished from local repo")
-
     def testInstallFromLocalRepo(self):
         apt = [self.apt,"-o", "Dir::Etc::sourcelist=%s"% self.sources]+apt_args
         cmd = apt+["update"]