diff options
| author |  David Leverton <levertond@googlemail.com>
| 2012-11-13 21:46:29 +0000 |
|---|---|---|
| committer | David Leverton <levertond@googlemail.com>
| 2012-11-13 21:46:29 +0000 |
| commit | 700427e4cfbb9ed6758202f1d71e5f171e75107b (patch) | |
| tree | 7ce3eaad6dc2762a617b8e60a61ab08426644466 | |
| parent | 91447d690b10eccf7c752b34108b10af28cfd6c6 (diff) | |
| download | paludis-700427e4cfbb9ed6758202f1d71e5f171e75107b.tar.gz paludis-700427e4cfbb9ed6758202f1d71e5f171e75107b.tar.xz | |
New location for Portage make.globals
| -rw-r--r-- | paludis/environments/portage/portage_environment.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/paludis/environments/portage/portage_environment.cc b/paludis/environments/portage/portage_environment.cc index 402c754..32aa3d5 100644 --- a/paludis/environments/portage/portage_environment.cc +++ b/paludis/environments/portage/portage_environment.cc @@ -253,8 +253,8 @@ PortageEnvironment::PortageEnvironment(const std::string & s) : &KeyValueConfigFile::no_defaults, &KeyValueConfigFile::no_transformation); _load_profile((_imp->conf_dir / "make.profile").realpath()); - if ((_imp->conf_dir / "make.globals").stat().exists()) - _imp->vars = std::make_shared<KeyValueConfigFile>(_imp->conf_dir / "make.globals", KeyValueConfigFileOptions() + + if ((FSPath(DATADIR) / "portage" / "config" / "make.globals").stat().exists()) + _imp->vars = std::make_shared<KeyValueConfigFile>(FSPath(DATADIR) / "portage" / "config" / "make.globals", KeyValueConfigFileOptions() + kvcfo_disallow_space_inside_unquoted_values + kvcfo_allow_inline_comments + kvcfo_allow_multiple_assigns_per_line, std::bind(&predefined, _imp->vars, std::placeholders::_1, std::placeholders::_2), &do_incremental); |