* ftparchive/writer.cc:

  - null the valid string instead of the date if Valid-Until is not set

diff --git a/debian/changelog b/debian/changelog
index 47b1eefae623cee2531897b83b9d0e3c2c8cdcc3..bf2459a034587da08bef030ec35c36e1bc0ad34e 100644 (file)
--- 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 58e32dade692810a8b0777ad415820d8fc3c1bc2..858e0d9df0c2470cc2c280cddd861764d77443c3 100644 (file)
--- 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;