Fixed a bug: the command line parsing should succeed if any of generic or configurati...
authorGuilherme Maciel Ferreira <guilherme.maciel.ferreira@gmail.com>
Sat, 8 Oct 2011 14:24:22 +0000 (11:24 -0300)
committerGuilherme Maciel Ferreira <guilherme.maciel.ferreira@gmail.com>
Sat, 8 Oct 2011 14:24:22 +0000 (11:24 -0300)
src/config/configurationcommandline.cpp

index f958cd1..a6cefc0 100644 (file)
@@ -146,14 +146,14 @@ bool ConfigurationCommandLine::parse(
 
     ConfigurationOptions options;
 
+    bool generic_parsed = options.parse_generic_options( vm, configuration );
     // Do not proceed if it is one of the halt options (i.e. --version, --help)
     bool halt = options.halt_on_generic_options( vm );
     if ( halt )
     {
         return false;
     }
-    bool generic_parsed = options.parse_generic_options( vm, configuration );
     bool configuration_parsed = options.parse_configuration_options( vm, configuration );
 
-    return ( generic_parsed && configuration_parsed );
+    return ( generic_parsed || configuration_parsed );
 }