* apt-pkg/acquire-item.cc:

  - use also unsigned Release files again (Closes: #596189)

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 752bc6a993eaed835def31268c708194cde4affd..7257f89e40fc401c453d5ba5bdb4489d39535dc5 100644 (file)
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -1060,12 +1060,6 @@ void pkgAcqMetaIndex::Done(string Message,unsigned long Size,string Hash,        /*{{{*
 
       // all cool, move Release file into place
       Complete = true;
-
-      string FinalFile = _config->FindDir("Dir::State::lists");
-      FinalFile += URItoFileName(RealURI);
-      Rename(DestFile,FinalFile);
-      chmod(FinalFile.c_str(),0644);
-      DestFile = FinalFile;
    }
    else
    {
@@ -1092,8 +1086,18 @@ void pkgAcqMetaIndex::Done(string Message,unsigned long Size,string Hash,        /*{{{*
          Desc.URI = "gpgv:" + SigFile;
          QueueURI(Desc);
          Mode = "gpgv";
+        return;
       }
    }
+
+   if (Complete == true)
+   {
+      string FinalFile = _config->FindDir("Dir::State::lists");
+      FinalFile += URItoFileName(RealURI);
+      Rename(DestFile,FinalFile);
+      chmod(FinalFile.c_str(),0644);
+      DestFile = FinalFile;
+   }
 }
                                                                        /*}}}*/
 void pkgAcqMetaIndex::RetrievalDone(string Message)                    /*{{{*/

diff --git a/debian/changelog b/debian/changelog
index bf2459a034587da08bef030ec35c36e1bc0ad34e..1780714b8a9b8e7c2ac2d7d3c36ea6b3a2e14acb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ apt (0.8.4) UNRELEASED; urgency=low
   [ David Kalnischkies ]
   * ftparchive/writer.cc:
     - null the valid string instead of the date if Valid-Until is not set
+  * apt-pkg/acquire-item.cc:
+    - use also unsigned Release files again (Closes: #596189)
 
- -- David Kalnischkies <kalnischkies@gmail.com>  Thu, 09 Sep 2010 11:25:54 +0200
+ -- David Kalnischkies <kalnischkies@gmail.com>  Thu, 09 Sep 2010 18:21:51 +0200
 
 apt (0.8.3) unstable; urgency=low