aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2008-07-23 22:00:41 +0100
committerAvatar David Leverton <levertond@googlemail.com> 2008-07-24 09:09:42 +0100
commitee8951598e753b4639d2e8272f7b6436557c2513 (patch)
tree95e60ed3d8f027e071fc22dd17226bac7e5b86d8
parentf9e7ecdd0252218a9dd9d34b908aa6978728c6e9 (diff)
downloadpaludis-ee8951598e753b4639d2e8272f7b6436557c2513.tar.gz
paludis-ee8951598e753b4639d2e8272f7b6436557c2513.tar.xz
Accept multiple variable assignments on one line in the places where Portage does. Fixes: ticket:608
-rw-r--r--paludis/environments/portage/portage_environment.cc6
-rw-r--r--paludis/repositories/e/e_repository_profile.cc2
2 files changed, 4 insertions, 4 deletions
diff --git a/paludis/environments/portage/portage_environment.cc b/paludis/environments/portage/portage_environment.cc
index 9957183..a05c108 100644
--- a/paludis/environments/portage/portage_environment.cc
+++ b/paludis/environments/portage/portage_environment.cc
@@ -259,12 +259,12 @@ PortageEnvironment::PortageEnvironment(const std::string & s) :
_load_profile((_imp->conf_dir / "make.profile").realpath());
if ((_imp->conf_dir / "make.globals").exists())
_imp->vars.reset(new KeyValueConfigFile(_imp->conf_dir / "make.globals", KeyValueConfigFileOptions() +
- kvcfo_disallow_space_inside_unquoted_values + kvcfo_allow_inline_comments,
+ kvcfo_disallow_space_inside_unquoted_values + kvcfo_allow_inline_comments + kvcfo_allow_multiple_assigns_per_line,
std::tr1::bind(&predefined, _imp->vars, std::tr1::placeholders::_1, std::tr1::placeholders::_2),
&do_incremental));
if ((_imp->conf_dir / "make.conf").exists())
_imp->vars.reset(new KeyValueConfigFile(_imp->conf_dir / "make.conf", KeyValueConfigFileOptions() +
- kvcfo_disallow_space_inside_unquoted_values + kvcfo_allow_inline_comments,
+ kvcfo_disallow_space_inside_unquoted_values + kvcfo_allow_inline_comments + kvcfo_allow_multiple_assigns_per_line,
std::tr1::bind(&predefined, _imp->vars, std::tr1::placeholders::_1, std::tr1::placeholders::_2),
&do_incremental_excluding_use_expand));
@@ -454,7 +454,7 @@ PortageEnvironment::_load_profile(const FSEntry & d)
if ((d / "make.defaults").exists())
_imp->vars.reset(new KeyValueConfigFile(d / "make.defaults", KeyValueConfigFileOptions()
- + kvcfo_disallow_source + kvcfo_disallow_space_inside_unquoted_values + kvcfo_allow_inline_comments,
+ + kvcfo_disallow_source + kvcfo_disallow_space_inside_unquoted_values + kvcfo_allow_inline_comments + kvcfo_allow_multiple_assigns_per_line,
std::tr1::bind(&predefined, _imp->vars, std::tr1::placeholders::_1, std::tr1::placeholders::_2),
&do_incremental));
diff --git a/paludis/repositories/e/e_repository_profile.cc b/paludis/repositories/e/e_repository_profile.cc
index c0f33ed..18ccda2 100644
--- a/paludis/repositories/e/e_repository_profile.cc
+++ b/paludis/repositories/e/e_repository_profile.cc
@@ -306,7 +306,7 @@ Implementation<ERepositoryProfile>::load_profile_make_defaults(const FSEntry & d
return;
KeyValueConfigFile file(dir / "make.defaults", KeyValueConfigFileOptions() +
- kvcfo_disallow_source + kvcfo_disallow_space_inside_unquoted_values + kvcfo_allow_inline_comments,
+ kvcfo_disallow_source + kvcfo_disallow_space_inside_unquoted_values + kvcfo_allow_inline_comments + kvcfo_allow_multiple_assigns_per_line,
&KeyValueConfigFile::no_defaults, &KeyValueConfigFile::no_transformation);
for (KeyValueConfigFile::ConstIterator k(file.begin()), k_end(file.end()) ;