From 26f4320b7f0bbcafb5ba3118df5c03fb9a8775c2 Mon Sep 17 00:00:00 2001 From: Nicolas Pope <nwpope@utu.fi> Date: Mon, 27 May 2019 10:48:33 +0300 Subject: [PATCH] Refix config loading --- components/common/cpp/src/configuration.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/common/cpp/src/configuration.cpp b/components/common/cpp/src/configuration.cpp index 287bdfc52..a302d606b 100644 --- a/components/common/cpp/src/configuration.cpp +++ b/components/common/cpp/src/configuration.cpp @@ -140,7 +140,7 @@ static bool findConfiguration(const string &file, const vector<string> &paths, bool found = false; if (file.length() > 0) { - f = mergeConfig(file); + f = mergeConfig(file.substr(1,file.length()-2)); found |= f; if (!f) { @@ -251,7 +251,7 @@ vector<string> ftl::configure(int argc, char **argv, const std::string &app) { paths.push_back(argv[0]); } - if (!findConfiguration(options["config"].substr(1,options["config"].length()-2), paths, app)) { + if (!findConfiguration(options["config"], paths, app)) { LOG(FATAL) << "Could not find any configuration!"; } process_options(options); -- GitLab