From feb5a5d2858fd83653000a7ff56093f5434a269a Mon Sep 17 00:00:00 2001 From: Guilherme Maciel Ferreira Date: Sat, 8 Oct 2011 11:24:22 -0300 Subject: [PATCH] Fixed a bug: the command line parsing should succeed if any of generic or configuration parsing were successful --- src/config/configurationcommandline.cpp | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/config/configurationcommandline.cpp b/src/config/configurationcommandline.cpp index f958cd1..a6cefc0 100644 --- a/src/config/configurationcommandline.cpp +++ b/src/config/configurationcommandline.cpp @@ -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 ); } -- 1.7.1