Merge lp:~asc/fluidity/usageerrorfix into lp:fluidity

[Adam Candy]

This addresses bug lp:919315, such that a version check and help call to Fluidity does not complete with a non-zero error.

Trunk fluidity:
# ./trunk/bin/fluidity -V; echo $?
...
255
# ./trunk/bin/fluidity -h; echo $?
...
255

This branch fluidity:
# ./trunk/bin/fluidity -V; echo $?
...
0
# ./trunk/bin/fluidity -h; echo $?
...
0

[Adam Candy (asc)]

Is this enough of a fix? The conversation at the Dev meeting eluded to the possibly of complications?

Note the output is still to stderr.

[lp:~asc/fluidity/usageerrorfix]

3903. By Gerard on 2012-01-25

Should return 0 rather than non-zero when the -V option is specified.

[Adam Candy (asc)]

Oddly my local version shows a different diff:
=== modified file 'main/Usage.cpp'
--- main/Usage.cpp 2011-10-28 04:52:07 +0000
+++ main/Usage.cpp 2012-01-25 12:29:34 +0000
@@ -273,13 +273,13 @@
   // Help?
   if(fl_command_line_options.count("help")){
     usage(argv[0]);
- exit(-1);
+ exit(0);
   }

   // Version?
   if(fl_command_line_options.count("version")){
     print_version();
- exit(-1);
+ exit(0);
   }

   // Verbose?

Both these line changes should be in the branch - I'm hoping Launchpad has made an error in the diff...

[Stephan Kramer (s-kramer)]

That's because Gerard's already committed half of your fix to the trunk in the mean time.

[Adam Candy (asc)]

I realised this on the walk back up to my desk. Thanks. That'll teach me to fix something that isn't assigned to me.

Still, I'll finish it off and merge this half in. Fluidity shouldn't error on a help request.

[lp:~asc/fluidity/usageerrorfix]

3904. By Adam Candy on 2012-01-25

A help call to Fluidity also does not now complete with a non-zero error.

=== modified file 'main/Usage.cpp'
--- main/Usage.cpp	2012-01-25 12:48:16 +0000
+++ main/Usage.cpp	2012-01-25 12:50:30 +0000
@@ -273,7 +273,7 @@
   // Help?
   if(fl_command_line_options.count("help")){
     usage(argv[0]);
-    exit(-1);
+    exit(0);
   }
   
   // Version?