X-Git-Url: http://git.annexia.org/?p=virt-top.git;a=blobdiff_plain;f=virt-top%2Fvirt_top_calendar1.ml;h=534465c51ffb82c451a64a167a80d880625a62bb;hp=438a7918e15532fb83a28ce6797f375aa5d64a0e;hb=cd478cbc43c4331243b6d0567fa0dd8606c9b8cf;hpb=627e6f64b0cd359a8f03d45ab093592f000cf6e6

diff --git a/virt-top/virt_top_calendar1.ml b/virt-top/virt_top_calendar1.ml
index 438a791..534465c 100755
--- a/virt-top/virt_top_calendar1.ml
+++ b/virt-top/virt_top_calendar1.ml
@@ -1,5 +1,5 @@
 (* 'top'-like tool for libvirt domains.
-   (C) Copyright 2007 Richard W.M. Jones, Red Hat Inc.
+   (C) Copyright 2007-2009 Richard W.M. Jones, Red Hat Inc.
    http://libvirt.org/
 
    This program is free software; you can redistribute it and/or modify
@@ -20,7 +20,9 @@
 *)
 
 open Printf
-open ExtString ;;
+open ExtString
+
+open Virt_top_gettext.Gettext ;;
 
 Virt_top.parse_date_time :=
 fun time ->
@@ -47,5 +49,8 @@ fun time ->
 
   eprintf "end time: %s\n" (Printer.CalendarPrinter.to_string cal);
 
-  (* Convert to a time_t, adjusting for the current timezone. *)
-  fst (Unix.mktime (Calendar.to_unixtm cal))
+  (* Convert to a time_t.  Note that we compare this against
+   * Unix.gettimeofday in the main module, so this must be returned as
+   * plain seconds from 1970 with no timezone adjustment.  (RHBZ#637964)
+   *)
+  Calendar.to_unixfloat cal