aboutsummaryrefslogtreecommitdiff
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
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.
-rw-r--r--paludis/environments/paludis/paludis_environment.cc2
-rw-r--r--paludis/environments/paludis/world.cc6
-rw-r--r--paludis/environments/portage/portage_environment.cc6
-rw-r--r--paludis/repositories/e/e_installed_repository.cc2
-rw-r--r--paludis/repositories/e/e_repository_sets.cc2
5 files changed, 9 insertions, 9 deletions
diff --git a/paludis/environments/paludis/paludis_environment.cc b/paludis/environments/paludis/paludis_environment.cc
index 8fd2d19..7718807 100644
--- a/paludis/environments/paludis/paludis_environment.cc
+++ b/paludis/environments/paludis/paludis_environment.cc
@@ -373,7 +373,7 @@ PaludisEnvironment::local_set(const SetName & ss) const
.file_name(dir / (stringify(s.first) + ".bash"))
.type(sft_paludis_bash)
.parser(std::tr1::bind(&parse_user_package_dep_spec, _1, this,
- UserPackageDepSpecOptions() + updso_allow_wildcards, filter::All()))
+ UserPackageDepSpecOptions() + updso_allow_wildcards + updso_no_disambiguation + updso_throw_if_set, filter::All()))
.tag(tag)
.set_operator_mode(s.second)
.environment(this));
diff --git a/paludis/environments/paludis/world.cc b/paludis/environments/paludis/world.cc
index e1a09b0..50be96e 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)
diff --git a/paludis/environments/portage/portage_environment.cc b/paludis/environments/portage/portage_environment.cc
index f622ba7..99f7227 100644
--- a/paludis/environments/portage/portage_environment.cc
+++ b/paludis/environments/portage/portage_environment.cc
@@ -844,7 +844,7 @@ PortageEnvironment::_add_string_to_world(const std::string & s) const
SetFile world(SetFileParams::create()
.file_name(_imp->world_file)
.type(sft_simple)
- .parser(std::tr1::bind(&parse_user_package_dep_spec, _1, this, UserPackageDepSpecOptions(), filter::All()))
+ .parser(std::tr1::bind(&parse_user_package_dep_spec, _1, this, UserPackageDepSpecOptions() + updso_no_disambiguation, filter::All()))
.tag(std::tr1::shared_ptr<DepTag>())
.set_operator_mode(sfsmo_natural)
.environment(this));
@@ -866,7 +866,7 @@ PortageEnvironment::_remove_string_from_world(const std::string & s) const
SetFile world(SetFileParams::create()
.file_name(_imp->world_file)
.type(sft_simple)
- .parser(std::tr1::bind(&parse_user_package_dep_spec, _1, this, UserPackageDepSpecOptions(),
+ .parser(std::tr1::bind(&parse_user_package_dep_spec, _1, this, UserPackageDepSpecOptions() + updso_no_disambiguation,
filter::All()))
.tag(std::tr1::shared_ptr<DepTag>())
.set_operator_mode(sfsmo_natural)
@@ -893,7 +893,7 @@ PortageEnvironment::world_set() const
SetFile world(SetFileParams::create()
.file_name(_imp->world_file)
.type(sft_simple)
- .parser(std::tr1::bind(&parse_user_package_dep_spec, _1, this, UserPackageDepSpecOptions(),
+ .parser(std::tr1::bind(&parse_user_package_dep_spec, _1, this, UserPackageDepSpecOptions() + updso_no_disambiguation,
filter::All()))
.tag(tag)
.set_operator_mode(sfsmo_natural)
diff --git a/paludis/repositories/e/e_installed_repository.cc b/paludis/repositories/e/e_installed_repository.cc
index 48338da..707b8d9 100644
--- a/paludis/repositories/e/e_installed_repository.cc
+++ b/paludis/repositories/e/e_installed_repository.cc
@@ -252,7 +252,7 @@ EInstalledRepository::package_set(const SetName & s) const
.file_name(_imp->params.deprecated_world)
.type(sft_simple)
.parser(std::tr1::bind(&parse_user_package_dep_spec, _1,
- _imp->params.environment, UserPackageDepSpecOptions(), filter::All()))
+ _imp->params.environment, UserPackageDepSpecOptions() + updso_no_disambiguation + updso_throw_if_set, filter::All()))
.tag(tag)
.set_operator_mode(sfsmo_natural)
.environment(_imp->params.environment));
diff --git a/paludis/repositories/e/e_repository_sets.cc b/paludis/repositories/e/e_repository_sets.cc
index a6e1bb4..2422619 100644
--- a/paludis/repositories/e/e_repository_sets.cc
+++ b/paludis/repositories/e/e_repository_sets.cc
@@ -119,7 +119,7 @@ ERepositorySets::package_set(const SetName & ss) const
.environment(_imp->environment)
.type(sft_paludis_conf)
.parser(std::tr1::bind(&parse_user_package_dep_spec, _1,
- _imp->environment, UserPackageDepSpecOptions(), filter::All()))
+ _imp->environment, UserPackageDepSpecOptions() + updso_no_disambiguation + updso_throw_if_set, filter::All()))
.set_operator_mode(s.second)
.tag(tag));