Cli: Fix autocompletion on Debian

refs #7246

diff --git a/icinga-app/icinga.cpp b/icinga-app/icinga.cpp
index e63dee3a9a9efd577b3e658af1aac5db5449ad59..2fb6a9322c61355048218689ebd69daf0281effd 100644 (file)
--- a/icinga-app/icinga.cpp
+++ b/icinga-app/icinga.cpp
@@ -243,9 +243,9 @@ int Main(void)
                }
        }
 
-       Logger::SetConsoleLogSeverity(logLevel);
-
        if (!autocomplete) {
+               Logger::SetConsoleLogSeverity(logLevel);
+
                if (vm.count("log-level")) {
                        String severity = vm["log-level"].as<std::string>();
 

diff --git a/lib/cli/CMakeLists.txt b/lib/cli/CMakeLists.txt
index fd6006945be37fc0bca080750e56be6860e16863..d16ec9d5b58ff29daf38234998bfc1101e38f59f 100644 (file)
--- a/lib/cli/CMakeLists.txt
+++ b/lib/cli/CMakeLists.txt
@@ -34,7 +34,7 @@ endif()
 
 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 (
   cli PROPERTIES

diff --git a/lib/cli/repositoryobjectcommand.cpp b/lib/cli/repositoryobjectcommand.cpp
index 22a328a2156a7eeae7b9800a4935a6c6d356d61f..cddbc7c40500102a672928eac554e1a6d4fc6a31 100644 (file)
--- a/lib/cli/repositoryobjectcommand.cpp
+++ b/lib/cli/repositoryobjectcommand.cpp
@@ -21,6 +21,7 @@
 #include "cli/repositoryutility.hpp"
 #include "base/logger.hpp"
 #include "base/application.hpp"
+#include "base/utility.hpp"
 #include <boost/foreach.hpp>
 #include <boost/algorithm/string/join.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
 {
        if (m_Command == RepositoryCommandAdd) {
+               Utility::LoadExtensionLibrary("icinga");
                const Type *ptype = Type::GetByName(m_Type);
                ASSERT(ptype);
                return GetFieldCompletionSuggestions(ptype, word);