[SCM] master: Properly format TimeoutException message and add unit.

[mark@sourceware.org]

The branch, master has been updated
       via  bc777c205aa8c0165ba7930630c146e5975b0fc0 (commit)
      from  8d3ef877015432d007f12e653677b2e41807a0b7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit bc777c205aa8c0165ba7930630c146e5975b0fc0
Author: Mark Wielaard <mwielaard@redhat.com>
Date:   Mon Feb 11 15:55:24 2008 +0100

    Properly format TimeoutException message and add unit.
    
    frysk-sys/frysk/expunit/ChangeLog
    2008-02-08  Mark Wielaard  <mark@klomp.org>
    
           * TimeoutException.java: Properly format message and add unit.

-----------------------------------------------------------------------

Summary of changes:
 frysk-sys/frysk/expunit/ChangeLog             |    4 ++++
 frysk-sys/frysk/expunit/TimeoutException.java |    5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

First 500 lines of diff:
diff --git a/frysk-sys/frysk/expunit/ChangeLog b/frysk-sys/frysk/expunit/ChangeLog
index ad00881..b2201c5 100644
--- a/frysk-sys/frysk/expunit/ChangeLog
+++ b/frysk-sys/frysk/expunit/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-08  Mark Wielaard  <mark@klomp.org>
+
+	* TimeoutException.java: Properly format message and add unit.
+	
 2008-02-08  Andrew Cagney  <cagney@redhat.com>
 
 	* Child.java: Update to match frysk.rsl.Log.
diff --git a/frysk-sys/frysk/expunit/TimeoutException.java b/frysk-sys/frysk/expunit/TimeoutException.java
index d050720..9d0d3d4 100644
--- a/frysk-sys/frysk/expunit/TimeoutException.java
+++ b/frysk-sys/frysk/expunit/TimeoutException.java
@@ -1,6 +1,6 @@
 // This file is part of the program FRYSK.
 //
-// Copyright 2007, Red Hat Inc.
+// Copyright 2007, 2008, Red Hat Inc.
 //
 // FRYSK is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
@@ -48,6 +48,7 @@ public class TimeoutException extends MatchException {
     static final long serialVersionUID = 1;
 
     TimeoutException(long millisecondTimeout, Match[] matches, String output) {
-	super("timeout of " + millisecondTimeout + "expired", matches, output);
+	super("timeout of " + millisecondTimeout + " milliseconds expired",
+	      matches, output);
     }
 }


hooks/post-receive
--
frysk system monitor/debugger