aboutsummaryrefslogtreecommitdiff
path: root/paludis/environments/paludis/world.cc
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2008-06-15 14:14:44 +0100
committerAvatar David Leverton <levertond@googlemail.com> 2008-06-15 14:14:44 +0100
commit05e649d809b4f502c97c41e4270986988549e876 (patch)
treeac3e61ac6b97c921f65eeeadfd0575c01ae25107 /paludis/environments/paludis/world.cc
parent69673da432788e0eb1492cb905e689361e9989ec (diff)
downloadpaludis-05e649d809b4f502c97c41e4270986988549e876.tar.gz
paludis-05e649d809b4f502c97c41e4270986988549e876.tar.xz
For clarity, enable sets and disable disambiguation in the parsers passed to SetFile, even though it doesn't make a difference currently.
Diffstat (limited to 'paludis/environments/paludis/world.cc')
-rw-r--r--paludis/environments/paludis/world.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/paludis/environments/paludis/world.cc b/paludis/environments/paludis/world.cc
index e1a09b051..50be96e2a 100644
--- a/paludis/environments/paludis/world.cc
+++ b/paludis/environments/paludis/world.cc
@@ -114,7 +114,7 @@ World::_add_string_to_world(const std::string & n) const
SetFile world(SetFileParams::create()
.file_name(*_imp->maybe_world_file)
.type(sft_simple)
- .parser(std::tr1::bind(&parse_user_package_dep_spec, _1, _imp->env, UserPackageDepSpecOptions(),
+ .parser(std::tr1::bind(&parse_user_package_dep_spec, _1, _imp->env, UserPackageDepSpecOptions() + updso_no_disambiguation + updso_throw_if_set,
filter::All()))
.tag(std::tr1::shared_ptr<DepTag>())
.set_operator_mode(sfsmo_natural)
@@ -144,7 +144,7 @@ World::_remove_string_from_world(const std::string & n) const
SetFile world(SetFileParams::create()
.file_name(*_imp->maybe_world_file)
.type(sft_simple)
- .parser(std::tr1::bind(&parse_user_package_dep_spec, _1, _imp->env, UserPackageDepSpecOptions(),
+ .parser(std::tr1::bind(&parse_user_package_dep_spec, _1, _imp->env, UserPackageDepSpecOptions() + updso_no_disambiguation + updso_throw_if_set,
filter::All()))
.tag(std::tr1::shared_ptr<DepTag>())
.set_operator_mode(sfsmo_natural)
@@ -169,7 +169,7 @@ World::world_set() const
SetFile world(SetFileParams::create()
.file_name(*_imp->maybe_world_file)
.type(sft_simple)
- .parser(std::tr1::bind(&parse_user_package_dep_spec, _1, _imp->env, UserPackageDepSpecOptions(),
+ .parser(std::tr1::bind(&parse_user_package_dep_spec, _1, _imp->env, UserPackageDepSpecOptions() + updso_no_disambiguation + updso_throw_if_set,
filter::All()))
.tag(tag)
.set_operator_mode(sfsmo_natural)