aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-07-26 19:28:50 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-07-26 19:28:50 +0000
commitdc413124ffea913a79f05c21143a7d48cb8f62c2 (patch)
treeeae5483dc3af6a85781482be81b1218be5e107bb
parentae1be2021ab1a28979c3e5e73ba8d03a32a2ac1d (diff)
downloadpaludis-dc413124ffea913a79f05c21143a7d48cb8f62c2.tar.gz
paludis-dc413124ffea913a79f05c21143a7d48cb8f62c2.tar.xz
Allow configuration suffix to be changed after DefaultConfig initialisation failure. (from Piotr Rak)
-rw-r--r--paludis/default_config.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/paludis/default_config.cc b/paludis/default_config.cc
index be91d04..1d16064 100644
--- a/paludis/default_config.cc
+++ b/paludis/default_config.cc
@@ -115,12 +115,13 @@ DefaultConfigError::DefaultConfigError(const std::string & msg) throw () :
DefaultConfig::DefaultConfig() :
PrivateImplementationPattern<DefaultConfig>(new Implementation<DefaultConfig>)
{
- _imp->config_suffix_can_be_set = false;
-
Context context("When loading default configuration:");
if (! getenv_with_default("PALUDIS_SKIP_CONFIG", "").empty())
+ {
+ _imp->config_suffix_can_be_set = false;
return;
+ }
/* indirection */
std::string root_prefix;
@@ -436,6 +437,8 @@ DefaultConfig::DefaultConfig() :
}
_imp->bashrc_files = stringify(config_dir / "bashrc");
+
+ _imp->config_suffix_can_be_set = false;
}
DefaultConfig::~DefaultConfig()