From 6da47b2f4b801112b7b818f12b90721a83f59f91 Mon Sep 17 00:00:00 2001
From: Nicolas Pope <nwpope@utu.fi>
Date: Sat, 25 Jul 2020 19:07:50 +0300
Subject: [PATCH] Another attempt at python fix
---
components/common/cpp/src/configuration.cpp | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/components/common/cpp/src/configuration.cpp b/components/common/cpp/src/configuration.cpp
index 20173db52..1d4bb01d6 100644
--- a/components/common/cpp/src/configuration.cpp
+++ b/components/common/cpp/src/configuration.cpp
@@ -277,7 +277,6 @@ static void _indexConfig(json_t &cfg) {
ftl::Configurable *ftl::config::find(const std::string &uri) {
if (uri.size() == 0) return nullptr;
-
std::string actual_uri = uri;
if (uri[0] == '/') {
if (uri.size() == 1) {
@@ -878,16 +877,13 @@ Configurable *ftl::config::configure(int argc, char **argv, const std::string &r
string root_str = (options.find("root") != options.end()) ? nlohmann::json::parse(options["root"]).get<string>() : root;
cfg_root_str = root_str;
- if (!config.contains("$id")) {
- config["$id"] = "ftl://utu.fi";
- }
-
if (options.find("id") != options.end()) config["$id"] = nlohmann::json::parse(options["id"]).get<string>();
_indexConfig(config);
config_restore = std::move(ftl::loadJSON(std::string(FTL_LOCAL_CONFIG_ROOT "/")+cfg_root_str+std::string("_session.json")));
Configurable *rootcfg = nullptr;
+ rootCFG = rootcfg;
try {
rootcfg = create<Configurable>(config);
--
GitLab