summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt-pkg/acquire-item.cc3
-rw-r--r--debian/changelog2
-rwxr-xr-xtest/pre-upload-check.py21
3 files changed, 21 insertions, 5 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 8c7b23fcb..15577363e 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -743,10 +743,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/debian/changelog b/debian/changelog
index a7cc0a5dd..b25e75ef5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ apt (0.7.6ubuntu13) gutsy; urgency=low
* apt-pkg/deb/dpkgpm.cc:
- fix crash in WriteApportReport (LP: #144537)
+ * apt-pkg/acquire-item.cc
+ - fix disappearing local Packages.gz file (LP: #131166)
--
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"]