summaryrefslogtreecommitdiff
path: root/ftparchive
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2010-09-09 19:04:26 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2010-09-09 19:04:26 +0200
commit3fcc94e919bad291348d53b1fd37b21ddf789cfd (patch)
tree0f94ba1cb15f2ff09c40d1d930216933351a4ae5 /ftparchive
parent2a19ec29ab5491fdb12a3ccaa1601097fdc83c86 (diff)
parent56bc3358caba1162d6e6108d5f6e5893de0dccec (diff)
* 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)
Diffstat (limited to 'ftparchive')
-rw-r--r--ftparchive/writer.cc4
1 files changed, 2 insertions, 2 deletions
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;