Просмотр исходного кода

* ftparchive/writer.cc:
- ensure that Date and Valid-Until time strings are not localised

David Kalnischkies лет назад: 15
Родитель
Сommit
cb12d0a677
2 измененных файлов с 12 добавлено и 1 удалено
  1. 7 1
      debian/changelog
  2. 5 0
      ftparchive/writer.cc

+ 7 - 1
debian/changelog

@@ -1,10 +1,16 @@
+
 apt (0.8.11.6) UNRELEASED; urgency=low
 
+  [ Christian Perrier ]
   * Fix error in French translation of manpages (apt_preferences(5)).
     Merci, Rémi Vanicat. Closes: #613689
   * Complete French manpage translation
 
- -- Christian Perrier <bubulle@debian.org>  Fri, 18 Feb 2011 05:53:49 +0100
+  [ David Kalnischkies ]
+  * ftparchive/writer.cc:
+    - ensure that Date and Valid-Until time strings are not localised
+
+ -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 22 Feb 2011 13:22:58 +0100
 
 apt (0.8.11.5) unstable; urgency=low
 

+ 5 - 0
ftparchive/writer.cc

@@ -925,6 +925,9 @@ ReleaseWriter::ReleaseWriter(string const &DB)
 
    Output = stdout;
    time_t const now = time(NULL);
+
+   setlocale(LC_TIME, "C");
+
    char datestr[128];
    if (strftime(datestr, sizeof(datestr), "%a, %d %b %Y %H:%M:%S UTC",
                 gmtime(&now)) == 0)
@@ -941,6 +944,8 @@ ReleaseWriter::ReleaseWriter(string const &DB)
       validstr[0] = '\0';
    }
 
+   setlocale(LC_TIME, "");
+
    map<string,string> Fields;
    Fields["Origin"] = "";
    Fields["Label"] = "";