tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cli: Fix autocompletion on Debian 

refs #7246
This commit is contained in:
Michael Friedrich 2014-10-27 14:13:55 +01:00
parent d9c8252f17
commit 4cf46de5ab
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
icinga-app/icinga.cpp
View File

@ -243,9 +243,9 @@ int Main(void)
} }
} }
Logger::SetConsoleLogSeverity(logLevel);
if (!autocomplete) { if (!autocomplete) {
Logger::SetConsoleLogSeverity(logLevel);
if (vm.count("log-level")) { if (vm.count("log-level")) {
String severity = vm["log-level"].as<std::string>(); String severity = vm["log-level"].as<std::string>();

2
lib/cli/CMakeLists.txt
View File

@ -34,7 +34,7 @@ endif()
add_library(cli SHARED ${cli_SOURCES}) add_library(cli SHARED ${cli_SOURCES})
target_link_libraries(cli ${Boost_LIBRARIES} base config remote icinga) target_link_libraries(cli ${Boost_LIBRARIES} base config remote)
set_target_properties ( set_target_properties (
cli PROPERTIES cli PROPERTIES

2
lib/cli/repositoryobjectcommand.cpp
View File

@ -21,6 +21,7 @@
#include "cli/repositoryutility.hpp" #include "cli/repositoryutility.hpp"
#include "base/logger.hpp" #include "base/logger.hpp"
#include "base/application.hpp" #include "base/application.hpp"
#include "base/utility.hpp"
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <boost/algorithm/string/join.hpp> #include <boost/algorithm/string/join.hpp>
#include <boost/algorithm/string/case_conv.hpp> #include <boost/algorithm/string/case_conv.hpp>
@ -125,6 +126,7 @@ void RepositoryObjectCommand::InitParameters(boost::program_options::options_des
std::vector<String> RepositoryObjectCommand::GetPositionalSuggestions(const String& word) const std::vector<String> RepositoryObjectCommand::GetPositionalSuggestions(const String& word) const
{ {
if (m_Command == RepositoryCommandAdd) { if (m_Command == RepositoryCommandAdd) {
Utility::LoadExtensionLibrary("icinga");
const Type *ptype = Type::GetByName(m_Type); const Type *ptype = Type::GetByName(m_Type);
ASSERT(ptype); ASSERT(ptype);
return GetFieldCompletionSuggestions(ptype, word); return GetFieldCompletionSuggestions(ptype, word);