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 /apt-pkg/acquire-item.cc | |
parent | cdb623ed0bcdf847544a20c0b3924ff129d85746 (diff) |
* apt-pkg/acquire-item.cc:
- use also unsigned Release files again (Closes: #596189)
Diffstat (limited to 'apt-pkg/acquire-item.cc')
-rw-r--r-- | apt-pkg/acquire-item.cc | 16 |
1 files changed, 10 insertions, 6 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) /*{{{*/ |