[rhmessaging-commits] rhmessaging commits: r3153 - in store/trunk/cpp: tests/jrnl/jtt and 1 other directory.

[rhmessaging-commits at lists.jboss.org]

Author: kpvdr
Date: 2009-03-11 16:13:02 -0400 (Wed, 11 Mar 2009)
New Revision: 3153

Modified:
   store/trunk/cpp/configure.ac
   store/trunk/cpp/tests/jrnl/jtt/jfile_chk.py
Log:
Updated version to 0.5 to match qpid verion; minor updates to journal analysis tool

Modified: store/trunk/cpp/configure.ac
===================================================================
--- store/trunk/cpp/configure.ac	2009-03-11 17:24:42 UTC (rev 3152)
+++ store/trunk/cpp/configure.ac	2009-03-11 20:13:02 UTC (rev 3153)
@@ -21,7 +21,7 @@
 dnl 
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([rhm], [0.4], [rhemrg-users-list at redhat.com])
+AC_INIT([rhm], [0.5], [rhemrg-users-list at redhat.com])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([dist-bzip2])
 

Modified: store/trunk/cpp/tests/jrnl/jtt/jfile_chk.py
===================================================================
--- store/trunk/cpp/tests/jrnl/jtt/jfile_chk.py	2009-03-11 17:24:42 UTC (rev 3152)
+++ store/trunk/cpp/tests/jrnl/jtt/jfile_chk.py	2009-03-11 20:13:02 UTC (rev 3153)
@@ -56,7 +56,7 @@
 
 def load(f, klass):
     args = load_args(f, klass)
-    subclass = klass.descriminate(args)
+    subclass = klass.discriminate(args)
     result = subclass(*args)
     if subclass != klass:
         result.init(f, *load_args(f, subclass))
@@ -183,9 +183,9 @@
  
     format = '=4sBBHQ'
     
-    def descriminate(args):
+    def discriminate(args):
         return CLASSES.get(args[1][-1], Hdr)
-    descriminate = staticmethod(descriminate)
+    discriminate = staticmethod(discriminate)
 
     def __init__(self, foffs, magic, ver, end, flags, rid):
         self.foffs = foffs
@@ -247,7 +247,7 @@
 
     def timestamp_str(self):
         ts = gmtime(self.time_sec)
-        fstr = '%%a %%b %%d %%H:%%M:%%S.%d %%Y' % (self.time_ns)
+        fstr = '%%a %%b %%d %%H:%%M:%%S.%09d %%Y' % (self.time_ns)
         return strftime(fstr, ts)