summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2010-09-09 11:26:18 +0200
committerDavid Kalnischkies <kalnischkies@gmail.com>2010-09-09 11:26:18 +0200
commitcdb623ed0bcdf847544a20c0b3924ff129d85746 (patch)
treec06f77b07ab7ffc78eb61709e7ad41d74539b661
parent0f0b4a0e63835ed3f7e1800a7115a52e8223c91e (diff)
* ftparchive/writer.cc:
- null the valid string instead of the date if Valid-Until is not set
-rw-r--r--debian/changelog8
-rw-r--r--ftparchive/writer.cc4
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 <kalnischkies@gmail.com> 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<string,string> Fields;