- only send LastModified if we actually have a file

  - delete zero size I-M-S hits

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;

debian/changelog

@@ -7,9 +7,10 @@ apt (0.7.7) UNRELEASED; urgency=low
   * apt-pkg/acquire-item.cc:
     - remove zero size files on I-M-S hit
   * methods/https.cc:
-    - only send LastModified if we actually have one
+    - only send LastModified if we actually have a file
     - send range request with if-range 
     - delete failed downloads
+    - delete zero size I-M-S hits
   * apt-pkg/deb/dpkgpm.{cc,h}:
     - merged dpkg-log branch, this lets you specify a 
       Dir::Log::Terminal file to log dpkg output to

methods/https.cc

@@ -161,13 +161,6 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
    }
    curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers);
 
-   // set time values
-   if(Itm->LastModified > 0)
-   {
-      curl_easy_setopt(curl, CURLOPT_TIMECONDITION, CURL_TIMECOND_IFMODSINCE);
-      curl_easy_setopt(curl, CURLOPT_TIMEVALUE, Itm->LastModified);
-   }
-
    // speed limit
    int dlLimit = _config->FindI("Acquire::http::Dl-Limit",0)*1024;
    if (dlLimit > 0)
@@ -183,7 +176,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
    // error handling
    curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, curl_errorstr);
 
-   // In this case we send an if-range query with a range header
+   // if we have the file send an if-range query with a range header
    if (stat(Itm->DestFile.c_str(),&SBuf) >= 0 && SBuf.st_size > 0)
    {
       char Buf[1000];
@@ -191,11 +184,17 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
 	      (long)SBuf.st_size - 1,
 	      TimeRFC1123(SBuf.st_mtime).c_str());
       headers = curl_slist_append(headers, Buf);
+   } 
+   else if(Itm->LastModified > 0)
+   {
+      curl_easy_setopt(curl, CURLOPT_TIMECONDITION, CURL_TIMECOND_IFMODSINCE);
+      curl_easy_setopt(curl, CURLOPT_TIMEVALUE, Itm->LastModified);
    }
 
    // go for it - if the file exists, append on it
    File = new FileFd(Itm->DestFile, FileFd::WriteAny);
-   File->Seek(File->Size());
+   if (File->Size() > 0)
+      File->Seek(File->Size() - 1);
    
    // keep apt updated
    Res.Filename = Itm->DestFile;
@@ -217,9 +216,6 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
    }
    File->Close();
 
-   if (Res.Size == 0)
-      Res.Size = File->Size();
-
    // Timestamp
    struct utimbuf UBuf;
    if (curl_servdate != -1) {
@@ -232,15 +228,19 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
    struct stat Buf;
    if (stat(File->Name().c_str(),&Buf) == 0)
    {
-      Res.Size = Buf.st_size;
       Res.Filename = File->Name();
       Res.LastModified = Buf.st_mtime;
       Res.IMSHit = false;
       if (curl_responsecode == 304)
       {
+	 unlink(File->Name().c_str());
 	 Res.IMSHit = true;
 	 Res.LastModified = Itm->LastModified;
+	 Res.Size = 0;
+	 URIDone(Res);
+	 return true;
       }
+      Res.Size = Buf.st_size;
    }
 
    // take hashes

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"]