summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2007-10-05 06:30:53 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2007-10-05 06:30:53 +0200
commit717847f20a7c090674dc03b75764de7670a58ac5 (patch)
treec02ac69fe408feb783a91d41138e9287c2ab9ce7
parent18a14a834e4068917d97467a3a52f17ed6055da3 (diff)
apt-pkg/acquire-item.cc:
- do not unlink() on normal i-m-s hit, this fixes the problem that local repository files got a i-m-s hit too and got removed test/pre-upload-check.py - add test for local Packages.gz file removal - add test for leftover files in partial/
-rw-r--r--apt-pkg/acquire-item.cc3
-rwxr-xr-xtest/pre-upload-check.py21
2 files changed, 19 insertions, 5 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 9c51184e6..c8ac84f56 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -693,10 +693,7 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string Hash,
// The files timestamp matches
if (StringToBool(LookupTag(Message,"IMS-Hit"),false) == true)
- {
- unlink(FileName.c_str());
return;
- }
if (FileName == DestFile)
Erase = true;
diff --git a/test/pre-upload-check.py b/test/pre-upload-check.py
index 2199c598a..373683360 100755
--- a/test/pre-upload-check.py
+++ b/test/pre-upload-check.py
@@ -72,7 +72,6 @@ class testAuthentication(unittest.TestCase):
call([self.apt,"update",
"-o","Dir::Etc::sourcelist=./%s" % f]+apt_args,
stdout=stdout, stderr=stderr)
- # then get the pkg
cmd = ["install", "-y", "-d", "--reinstall",
"%s=%s" % (self.pkg, self.pkgver),
"-o","Dir::state::Status=./fake-status"]
@@ -92,7 +91,9 @@ class testAuthentication(unittest.TestCase):
stdout=stdout, stderr=stderr)
self.assert_(res == expected_res,
"test '%s' failed (got %s expected %s" % (f,res,expected_res))
-
+ if expected_res == 0:
+ self.assert_(len(glob.glob("/var/lib/apt/lists/partial/*")) == 0,
+ "partial/ dir has leftover files: %s" % glob.glob("/var/lib/apt/lists/partial/*"))
class testLocalRepositories(unittest.TestCase):
@@ -119,6 +120,22 @@ 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"]