From 3ca237c150e2cef9120c6951bfff1be5b5a78d9a Mon Sep 17 00:00:00 2001
From: frank <frank.zhang@citrix.com>
Date: Wed, 23 Nov 2011 17:33:15 -0800
Subject: [PATCH] better help message of cloud-setup-database

---
 setup/bindir/cloud-setup-databases.in | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/setup/bindir/cloud-setup-databases.in b/setup/bindir/cloud-setup-databases.in
index d6b19e55525..de33bdf08c9 100755
--- a/setup/bindir/cloud-setup-databases.in
+++ b/setup/bindir/cloud-setup-databases.in
@@ -156,12 +156,19 @@ Sql parameters:
         
     def errorAndExit(self, msg):
         self.postRun()
-        if self.parser != None:
-            self.parser.error(msg)
-        else:
-            sys.stderr.write(msg)
-            sys.stderr.flush()
-            sys.exit(1)
+        err = '''\n\nWe apologize for below error:
+***************************************************************      
+%s
+*************************************************************** 
+Please run:
+
+    cloud-setup-database -h
+
+for full help
+''' % msg
+        sys.stderr.write(err)
+        sys.stderr.flush()
+        sys.exit(1)
     
     def setupDBSchema(self):
         if not self.rootuser: