summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt-pkg/acquire-item.cc16
-rw-r--r--debian/changelog7
-rw-r--r--ftparchive/writer.cc4
3 files changed, 19 insertions, 8 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 4fdf13ccc..7b126b661 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,16 @@
apt (0.8.4) UNRELEASED; urgency=low
+ [ Michael vogt ]
* ftparchive/writer.cc:
- write out {Files,Checksum-Sha1,Checksum-Sha256} only if
available LP: #633967. Thanks to Colin Watson
+ [ 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)
+
-- Michael Vogt <michael.vogt@ubuntu.com> Thu, 09 Sep 2010 15:30:19 +0200
apt (0.8.3) unstable; urgency=low
diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc
index c280f5ed3..d7d699ddc 100644
--- a/ftparchive/writer.cc
+++ b/ftparchive/writer.cc
@@ -928,12 +928,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<string,string> Fields;