diff options
| author |  Ciaran McCreesh <ciaran.mccreesh@googlemail.com>
| 2009-09-03 16:27:07 +0100 |
|---|---|---|
| committer | Ciaran McCreesh <ciaran.mccreesh@googlemail.com>
| 2009-09-03 16:27:07 +0100 |
| commit | 0c7d469028ea2f6b68695dece1b38cc8010d531f (patch) | |
| tree | 84b79bd5ce110b1d00b4d49129d541730971a784 /paludis/environments/paludis/world.cc | |
| parent | 0e96d49be7ff18688cb6219c9c1c72b2006b01dd (diff) | |
| download | paludis-0c7d469028ea2f6b68695dece1b38cc8010d531f.tar.gz paludis-0c7d469028ea2f6b68695dece1b38cc8010d531f.tar.xz | |
Change how we deserialise package dep specs
This reverts commit ad761cd5e507e344ebc5f0c467b04f7d3dc729a3.
Diffstat (limited to 'paludis/environments/paludis/world.cc')
| -rw-r--r-- | paludis/environments/paludis/world.cc | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/paludis/environments/paludis/world.cc b/paludis/environments/paludis/world.cc index 7bccd2a1e..f78daca14 100644 --- a/paludis/environments/paludis/world.cc +++ b/paludis/environments/paludis/world.cc @@ -118,9 +118,7 @@ World::_add_string_to_world(const std::string & n) const SetFile world(make_named_values<SetFileParams>( value_for<n::environment>(_imp->env), value_for<n::file_name>(*_imp->maybe_world_file), - value_for<n::parser>(std::tr1::bind(&parse_user_package_dep_spec, _1, _imp->env, - UserPackageDepSpecOptions() + updso_no_disambiguation + updso_throw_if_set, filter::All(), - make_null_shared_ptr())), + value_for<n::parser>(std::tr1::bind(&parse_user_package_dep_spec, _1, _imp->env, UserPackageDepSpecOptions() + updso_no_disambiguation + updso_throw_if_set, filter::All())), value_for<n::set_operator_mode>(sfsmo_natural), value_for<n::tag>(std::tr1::shared_ptr<DepTag>()), value_for<n::type>(sft_simple) @@ -150,9 +148,7 @@ World::_remove_string_from_world(const std::string & n) const SetFile world(make_named_values<SetFileParams>( value_for<n::environment>(_imp->env), value_for<n::file_name>(*_imp->maybe_world_file), - value_for<n::parser>(std::tr1::bind(&parse_user_package_dep_spec, _1, _imp->env, - UserPackageDepSpecOptions() + updso_no_disambiguation + updso_throw_if_set, filter::All(), - make_null_shared_ptr())), + value_for<n::parser>(std::tr1::bind(&parse_user_package_dep_spec, _1, _imp->env, UserPackageDepSpecOptions() + updso_no_disambiguation + updso_throw_if_set, filter::All())), value_for<n::set_operator_mode>(sfsmo_natural), value_for<n::tag>(std::tr1::shared_ptr<DepTag>()), value_for<n::type>(sft_simple) @@ -177,9 +173,7 @@ World::world_set() const SetFile world(make_named_values<SetFileParams>( value_for<n::environment>(_imp->env), value_for<n::file_name>(*_imp->maybe_world_file), - value_for<n::parser>(std::tr1::bind(&parse_user_package_dep_spec, _1, _imp->env, - UserPackageDepSpecOptions() + updso_no_disambiguation + updso_throw_if_set, filter::All(), - make_null_shared_ptr())), + value_for<n::parser>(std::tr1::bind(&parse_user_package_dep_spec, _1, _imp->env, UserPackageDepSpecOptions() + updso_no_disambiguation + updso_throw_if_set, filter::All())), value_for<n::set_operator_mode>(sfsmo_natural), value_for<n::tag>(tag), value_for<n::type>(sft_simple) |