Page MenuHomePhabricator
Files F13115578

D5905.diff
No OneTemporary
Actions

D5905.diff
View Options

diff --git a/src/util/system.cpp b/src/util/system.cpp
--- a/src/util/system.cpp
+++ b/src/util/system.cpp
@@ -1070,22 +1070,20 @@
// Warn about recursive -includeconf
conf_file_names = GetArgs("-includeconf");
- {
- std::vector<std::string> includeconf_net(
- GetArgs(std::string("-") + chain_id + ".includeconf"));
+ std::vector<std::string> includeconf_net(
+ GetArgs(std::string("-") + chain_id + ".includeconf"));
+ conf_file_names.insert(conf_file_names.end(),
+ includeconf_net.begin(),
+ includeconf_net.end());
+ std::string chain_id_final = GetChainName();
+ if (chain_id_final != chain_id) {
+ // Also warn about recursive includeconf for the chain that was
+ // specified in one of the includeconfs
+ includeconf_net =
+ GetArgs(std::string("-") + chain_id_final + ".includeconf");
conf_file_names.insert(conf_file_names.end(),
includeconf_net.begin(),
includeconf_net.end());
- std::string chain_id_final = GetChainName();
- if (chain_id_final != chain_id) {
- // Also warn about recursive includeconf for the chain that
- // was specified in one of the includeconfs
- includeconf_net = GetArgs(std::string("-") +
- chain_id_final + ".includeconf");
- conf_file_names.insert(conf_file_names.end(),
- includeconf_net.begin(),
- includeconf_net.end());
- }
}
for (const std::string &conf_file_name : conf_file_names) {
tfm::format(std::cerr,

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 1, 11:28 (5 h, 56 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5187604
Default Alt Text
D5905.diff (1 KB)

Event Timeline