tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-23 21:55:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7180 from Icinga/bugfix/revert-exit-code

Browse Source 
Revert "CLI: Return non-zero on unknown sub commands"
This commit is contained in:
Michael Friedrich 2019-05-10 15:17:51 +02:00 committed by GitHub
commit 47ce864fae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
icinga-app/icinga.cpp
View File

@ -327,13 +327,8 @@ static int Main()
po::variables_map vm; po::variables_map vm;
try { try {
if (!CLICommand::ParseCommand(argc, argv, visibleDesc, hiddenDesc, positionalDesc, CLICommand::ParseCommand(argc, argv, visibleDesc, hiddenDesc, positionalDesc,
vm, cmdname, command, autocomplete)) { vm, cmdname, command, autocomplete);
Log(LogCritical, "icinga-app")
<< "Command parsing error. Try '--help'.";
return EXIT_FAILURE;
}
} catch (const std::exception& ex) { } catch (const std::exception& ex) {
Log(LogCritical, "icinga-app") Log(LogCritical, "icinga-app")
<< "Error while parsing command-line options: " << ex.what(); << "Error while parsing command-line options: " << ex.what();

5
lib/cli/clicommand.cpp
View File

@ -200,12 +200,9 @@ found_command:
visibleDesc.add(vdesc); visibleDesc.add(vdesc);
} }
if (autocomplete) if (autocomplete || (tried_command && !command))
return true; return true;
if (tried_command && !command)
return false;
po::options_description adesc; po::options_description adesc;
adesc.add(visibleDesc); adesc.add(visibleDesc);
adesc.add(hiddenDesc); adesc.add(hiddenDesc);