aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2007-05-24 21:01:00 +0000
committerAvatar David Leverton <levertond@googlemail.com> 2007-05-24 21:01:00 +0000
commit9b7bfeac95df0cbe76fbf60976e789fae2890c5e (patch)
treebee5da904406b1b6541a5b8caa6b1154afdaa0ae
parentb45de4609192d5abe9efdef024bd68fd73f3aae6 (diff)
downloadpaludis-9b7bfeac95df0cbe76fbf60976e789fae2890c5e.tar.gz
paludis-9b7bfeac95df0cbe76fbf60976e789fae2890c5e.tar.xz
Allow ${ROOT} in repository_defaults.{conf,bash}.
-rw-r--r--paludis/environments/paludis/paludis_config.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/paludis/environments/paludis/paludis_config.cc b/paludis/environments/paludis/paludis_config.cc
index 55e3bd6..041c1d4 100644
--- a/paludis/environments/paludis/paludis_config.cc
+++ b/paludis/environments/paludis/paludis_config.cc
@@ -265,7 +265,7 @@ PaludisConfig::PaludisConfig(PaludisEnvironment * const e, const std::string & s
if ((local_config_dir / "repository_defaults.conf").exists())
{
- KeyValueConfigFile defaults_file(local_config_dir / "repository_defaults.conf", KeyValueConfigFileOptions());
+ KeyValueConfigFile defaults_file(local_config_dir / "repository_defaults.conf", KeyValueConfigFileOptions(), KeyValueConfigFile::Defaults(conf_vars));
std::copy(defaults_file.begin(), defaults_file.end(), conf_vars->inserter());
}
else if ((local_config_dir / "repository_defaults.bash").exists())
@@ -275,7 +275,7 @@ PaludisConfig::PaludisConfig(PaludisEnvironment * const e, const std::string & s
.with_setenv("PALUDIS_EBUILD_DIR", getenv_with_default("PALUDIS_EBUILD_DIR", LIBEXECDIR "/paludis"))
.with_stderr_prefix("repository_defaults.bash> "));
PStream s(cmd);
- KeyValueConfigFile defaults_file(s, KeyValueConfigFileOptions());
+ KeyValueConfigFile defaults_file(s, KeyValueConfigFileOptions(), KeyValueConfigFile::Defaults(conf_vars));
std::copy(defaults_file.begin(), defaults_file.end(), conf_vars->inserter());
}