aboutsummaryrefslogtreecommitdiff
path: root/paludis/environments/portage/portage_environment.cc
diff options
context:
space:
mode:
Diffstat (limited to 'paludis/environments/portage/portage_environment.cc')
-rw-r--r--paludis/environments/portage/portage_environment.cc13
1 files changed, 8 insertions, 5 deletions
diff --git a/paludis/environments/portage/portage_environment.cc b/paludis/environments/portage/portage_environment.cc
index 194b8ba..f622ba7 100644
--- a/paludis/environments/portage/portage_environment.cc
+++ b/paludis/environments/portage/portage_environment.cc
@@ -326,7 +326,7 @@ PortageEnvironment::_load_atom_file(const FSEntry & f, I_ i, const std::string &
continue;
std::tr1::shared_ptr<PackageDepSpec> p(new PackageDepSpec(parse_user_package_dep_spec(
- tokens.at(0), UserPackageDepSpecOptions())));
+ tokens.at(0), this, UserPackageDepSpecOptions())));
if (reject_additional && p->additional_requirements_ptr())
{
Log::get_instance()->message("portage_environment.bad_spec", ll_warning, lc_context)
@@ -372,7 +372,8 @@ PortageEnvironment::_load_lined_file(const FSEntry & f, I_ i)
for (LineConfigFile::ConstIterator line(file.begin()), line_end(file.end()) ;
line != line_end ; ++line)
*i++ = std::tr1::shared_ptr<PackageDepSpec>(new PackageDepSpec(
- parse_user_package_dep_spec(strip_trailing(strip_leading(*line, " \t"), " \t"), UserPackageDepSpecOptions())));
+ parse_user_package_dep_spec(strip_trailing(strip_leading(*line, " \t"), " \t"),
+ this, UserPackageDepSpecOptions())));
}
}
@@ -843,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, UserPackageDepSpecOptions()))
+ .parser(std::tr1::bind(&parse_user_package_dep_spec, _1, this, UserPackageDepSpecOptions(), filter::All()))
.tag(std::tr1::shared_ptr<DepTag>())
.set_operator_mode(sfsmo_natural)
.environment(this));
@@ -865,7 +866,8 @@ 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, UserPackageDepSpecOptions()))
+ .parser(std::tr1::bind(&parse_user_package_dep_spec, _1, this, UserPackageDepSpecOptions(),
+ filter::All()))
.tag(std::tr1::shared_ptr<DepTag>())
.set_operator_mode(sfsmo_natural)
.environment(this));
@@ -891,7 +893,8 @@ 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, UserPackageDepSpecOptions()))
+ .parser(std::tr1::bind(&parse_user_package_dep_spec, _1, this, UserPackageDepSpecOptions(),
+ filter::All()))
.tag(tag)
.set_operator_mode(sfsmo_natural)
.environment(this));