From cdb623ed0bcdf847544a20c0b3924ff129d85746 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 9 Sep 2010 11:26:18 +0200 Subject: * ftparchive/writer.cc: - null the valid string instead of the date if Valid-Until is not set --- debian/changelog | 8 ++++++++ ftparchive/writer.cc | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 47b1eefae..bf2459a03 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +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 + + -- David Kalnischkies Thu, 09 Sep 2010 11:25:54 +0200 + apt (0.8.3) unstable; urgency=low [ Manpages translations ] diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc index 58e32dade..858e0d9df 100644 --- a/ftparchive/writer.cc +++ b/ftparchive/writer.cc @@ -925,12 +925,12 @@ ReleaseWriter::ReleaseWriter(string const &DB) } time_t const validuntil = now + _config->FindI("APT::FTPArchive::Release::ValidTime", 0); - char validstr[128] = ""; + char validstr[128]; if (now == validuntil || strftime(validstr, sizeof(validstr), "%a, %d %b %Y %H:%M:%S UTC", gmtime(&validuntil)) == 0) { - datestr[0] = '\0'; + validstr[0] = '\0'; } map Fields; -- cgit v1.2.3 From 56bc3358caba1162d6e6108d5f6e5893de0dccec Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 9 Sep 2010 18:23:08 +0200 Subject: * apt-pkg/acquire-item.cc: - use also unsigned Release files again (Closes: #596189) --- apt-pkg/acquire-item.cc | 16 ++++++++++------ 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 Thu, 09 Sep 2010 11:25:54 +0200 + -- David Kalnischkies Thu, 09 Sep 2010 18:21:51 +0200 apt (0.8.3) unstable; urgency=low -- cgit v1.2.3