aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-08-06 10:25:37 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-08-06 10:56:04 +0100
commitb94fb37a104d7ed15b8fbad141439b03ad79f13e (patch)
treec39c6b3ef91d626f0644d0ec953f01717e258509
parentb81bef03217d268a85feb5e8a66b16eb889084e3 (diff)
downloadpaludis-b94fb37a104d7ed15b8fbad141439b03ad79f13e.tar.gz
paludis-b94fb37a104d7ed15b8fbad141439b03ad79f13e.tar.xz
Give repo config file keys priority for root= etc
-rw-r--r--paludis/environments/paludis/paludis_config.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/paludis/environments/paludis/paludis_config.cc b/paludis/environments/paludis/paludis_config.cc
index 68007e5..a1b3b32 100644
--- a/paludis/environments/paludis/paludis_config.cc
+++ b/paludis/environments/paludis/paludis_config.cc
@@ -510,7 +510,8 @@ PaludisConfig::PaludisConfig(PaludisEnvironment * const e, const std::string & s
}
}
- _imp->predefined_conf_vars_func = std::bind(&initial_conf_vars, _imp->root_prefix, std::placeholders::_1);
+ _imp->predefined_conf_vars_func = std::bind(&initial_conf_vars,
+ _imp->root_prefix.empty() ? "/" : _imp->root_prefix, std::placeholders::_1);
Log::get_instance()->message("paludis_environment.paludis_config.real_dir", ll_debug, lc_no_context)
<< "PaludisConfig real directory is '" << local_config_dir << "', root prefix is '" << _imp->root_prefix
@@ -879,8 +880,6 @@ PaludisConfig::repo_func_from_file(const FSEntry & repo_file)
std::bind(&from_kv, kv, std::placeholders::_1));
repo_func = std::bind(&override, "repo_file", stringify(repo_file), repo_func, std::placeholders::_1);
- repo_func = std::bind(&override, "root", _imp->root_prefix.empty() ? "/" : _imp->root_prefix,
- repo_func, std::placeholders::_1);
return repo_func;
}