diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2010-09-09 18:23:08 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2010-09-09 18:23:08 +0200 |
| commit | 56bc3358caba1162d6e6108d5f6e5893de0dccec (patch) | |
| tree | 6a724dd8223d5a926b5dad826cac20e113f40070 | |
| parent | cdb623ed0bcdf847544a20c0b3924ff129d85746 (diff) | |
* apt-pkg/acquire-item.cc:
- use also unsigned Release files again (Closes: #596189)
| -rw-r--r-- | apt-pkg/acquire-item.cc | 16 | ||||
| -rw-r--r-- | debian/changelog | 4 |
2 files changed, 13 insertions, 7 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 752bc6a99..7257f89e4 100644 --- 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 bf2459a03..1780714b8 100644 --- 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 |