[PATCH master 2/2] Fix format of the error messages

[Helga Velroyen]

Signed-off-by: Helga Velroyen <hel...@google.com>
---
 htest/shelltests/htools-invalid.test   |    8 ++++----
 htools/Ganeti/HTools/ExtLoader.hs      |    2 +-
 htools/Ganeti/HTools/Program/Hcheck.hs |    2 +-
 htools/Ganeti/HTools/Program/Hspace.hs |    2 +-
 htools/Ganeti/Utils.hs                 |    2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/htest/shelltests/htools-invalid.test 
b/htest/shelltests/htools-invalid.test
index a8160bd..1625b25 100644
--- a/htest/shelltests/htools-invalid.test
+++ b/htest/shelltests/htools-invalid.test
@@ -25,20 +25,20 @@
 # extra arguments
 ./htest/hspace unexpected-argument
 >>>2
-Error: this program doesn't take any arguments.
+Error: This program doesn't take any arguments.
 >>>=1
 
 ./htest/hbal unexpected-argument
 >>>2
-Error: this program doesn't take any arguments.
+Error: This program doesn't take any arguments.
 >>>=1
 
 ./htest/hinfo unexpected-argument
 >>>2
-Error: this program doesn't take any arguments.
+Error: This program doesn't take any arguments.
 >>>=1
 
 ./htest/hcheck unexpected-argument
 >>>2
-Error: this program doesn't take any arguments.
+Error: This program doesn't take any arguments.
 >>>=1
diff --git a/htools/Ganeti/HTools/ExtLoader.hs 
b/htools/Ganeti/HTools/ExtLoader.hs
index 534ca7e..17a6bed 100644
--- a/htools/Ganeti/HTools/ExtLoader.hs
+++ b/htools/Ganeti/HTools/ExtLoader.hs
@@ -95,7 +95,7 @@ loadExternalData opts = do
       exInsts = optExInst opts
 
   exitWhen (length allSet > 1) "Only one of the rapi, luxi, and data\
-                               \ files options should be given"
+                               \ files options should be given."
 
   util_contents <- maybe (return "") readFile (optDynuFile opts)
   util_data <- exitIfBad "can't parse utilisation data" .
diff --git a/htools/Ganeti/HTools/Program/Hcheck.hs 
b/htools/Ganeti/HTools/Program/Hcheck.hs
index 12e46a4..f02b52a 100644
--- a/htools/Ganeti/HTools/Program/Hcheck.hs
+++ b/htools/Ganeti/HTools/Program/Hcheck.hs
@@ -295,7 +295,7 @@ printFinalHTC = printFinal htcPrefix
 -- | Main function.
 main :: Options -> [String] -> IO ()
 main opts args = do
-  unless (null args) $ exitErr "this program doesn't take any arguments."
+  unless (null args) $ exitErr "This program doesn't take any arguments."
 
   let verbose = optVerbose opts
       machineread = optMachineReadable opts
diff --git a/htools/Ganeti/HTools/Program/Hspace.hs 
b/htools/Ganeti/HTools/Program/Hspace.hs
index 6ec9ea6..9ad61b8 100644
--- a/htools/Ganeti/HTools/Program/Hspace.hs
+++ b/htools/Ganeti/HTools/Program/Hspace.hs
@@ -387,7 +387,7 @@ instFromSpec spx =
 -- | Main function.
 main :: Options -> [String] -> IO ()
 main opts args = do
-  exitUnless (null args) "this program doesn't take any arguments"
+  exitUnless (null args) "This program doesn't take any arguments."
 
   let verbose = optVerbose opts
       machine_r = optMachineReadable opts
diff --git a/htools/Ganeti/Utils.hs b/htools/Ganeti/Utils.hs
index a651252..9636a34 100644
--- a/htools/Ganeti/Utils.hs
+++ b/htools/Ganeti/Utils.hs
@@ -219,7 +219,7 @@ exitIfBad _ (Ok v) = return v
 -- | Exits immediately with an error message.
 exitErr :: String -> IO a
 exitErr errmsg = do
-  hPutStrLn stderr $ "Error: " ++ errmsg ++ "."
+  hPutStrLn stderr $ "Error: " ++ errmsg
   exitWith (ExitFailure 1)
 
 -- | Exits with an error message if the given boolean condition if true.
-- 
1.7.7.3