Merge lp:~mohyt/drizzle/trunk-bug-943657 into lp:~drizzle-trunk/drizzle/development

[Mohit Srivastava]

Bug : 943657

Various error messages are formatted

[Olaf van der Spek (olafvdspek)]

Hi Mohit,

Nice one! I'm missing a space between << and " and >> though.

review: Needs Fixing

[Mohit Srivastava (mohyt)]

Hi Olaf ,

Will you please post the test result ?

--
Mohit

On Mon, Mar 19, 2012 at 4:45 PM, Olaf van der Spek <email address hidden>wrote:

> Review: Needs Fixing
>
> Hi Mohit,
>
> Nice one! I'm missing a space between << and " and >> though.
> --
>
> https://code.launchpad.net/~srivastavamohit91/drizzle/trunk-bug-943657/+merge/98063
> You are the owner of lp:~srivastavamohit91/drizzle/trunk-bug-943657.
>

[Olaf van der Spek (olafvdspek)]

What test result?
I'm talking about the code:
unireg_abort << err.what() <<". "<< "Use --help to get a list of available options. ";
should be
unireg_abort << err.what() << ". " << "Use --help to get a list of available options. ";

[lp:~mohyt/drizzle/trunk-bug-943657]

2529. By Mohit Srivastava on 2012-03-20

Space between << and " and << modify.

[Mohit Srivastava (mohyt)]

Hi Olaf,

I updated the code with related query.
--
Mohit

[Olaf van der Spek (olafvdspek)]

Thanks. But now there are two spaces between unireg_abort and <<.
On the second change a space is missing before unireg_abort.

=== modified file 'drizzled/drizzled.cc'
--- drizzled/drizzled.cc	2012-02-12 08:22:19 +0000
+++ drizzled/drizzled.cc	2012-03-20 11:50:25 +0000
@@ -1276,7 +1276,7 @@
   }
   catch (po::validation_error &err)
   {
-    unireg_abort << "Use --help to get a list of available options. " << err.what(); 
+    unireg_abort  << err.what() << ". " << "Use --help to get a list of available options. "; 
   }
 
   if (vm.count("version"))
@@ -1317,7 +1317,7 @@
   }
   catch (po::validation_error &err)
   {
-    unireg_abort << "Use --help to get a list of available options. " << err.what();
+   unireg_abort  << err.what() << ". " << "Use --help to get a list of available options. ";
   }
 
   return true;
@@ -1357,15 +1357,15 @@
   }
   catch (po::validation_error &err)
   {
-    unireg_abort << "Use --help to get a list of available options. " << err.what();
+    unireg_abort  << err.what() << ". " << "Use --help to get a list of available options. ";
   }
   catch (po::invalid_command_line_syntax &err)
   {
-    unireg_abort << "Use --help to get a list of available options. " << err.what();
+    unireg_abort  << err.what() << ". " << "Use --help to get a list of available options. ";
   }
   catch (po::unknown_option &err)
   {
-    unireg_abort << "Use --help to get a list of available options.  " << err.what();
+    unireg_abort  << err.what() << ". " << "Use --help to get a list of available options. ";
   }
 
   try
@@ -1374,7 +1374,7 @@
   }
   catch (po::validation_error &err)
   {
-    unireg_abort << "Use --help to get a list of available options. " << err.what();
+    unireg_abort  << err.what() << ". " << "Use --help to get a list of available options. ";
   }
 
   get_options();