aboutsummaryrefslogtreecommitdiff
path: root/paludis/environments
diff options
context:
space:
mode:
Diffstat (limited to 'paludis/environments')
-rw-r--r--paludis/environments/paludis/paludis_config.cc10
-rw-r--r--paludis/environments/paludis/paludis_environment.cc6
-rw-r--r--paludis/environments/portage/portage_environment.cc4
3 files changed, 10 insertions, 10 deletions
diff --git a/paludis/environments/paludis/paludis_config.cc b/paludis/environments/paludis/paludis_config.cc
index 1199ef76b..1bb2a4e7b 100644
--- a/paludis/environments/paludis/paludis_config.cc
+++ b/paludis/environments/paludis/paludis_config.cc
@@ -420,7 +420,7 @@ PaludisConfig::PaludisConfig(PaludisEnvironment * const e, const std::string & s
}
else
{
- std::tr1::shared_ptr<const PackageDepSpec> a(new PackageDepSpec(tokens.at(0)));
+ std::tr1::shared_ptr<const PackageDepSpec> a(new PackageDepSpec(tokens.at(0), pds_pm_unspecific));
for (std::vector<std::string>::const_iterator t(next(tokens.begin())), t_end(tokens.end()) ;
t != t_end ; ++t)
{
@@ -475,7 +475,7 @@ PaludisConfig::PaludisConfig(PaludisEnvironment * const e, const std::string & s
}
else
{
- std::tr1::shared_ptr<const PackageDepSpec> a(new PackageDepSpec(tokens.at(0)));
+ std::tr1::shared_ptr<const PackageDepSpec> a(new PackageDepSpec(tokens.at(0), pds_pm_unspecific));
for (std::vector<std::string>::const_iterator t(next(tokens.begin())), t_end(tokens.end()) ;
t != t_end ; ++t)
if (a->package_ptr())
@@ -522,7 +522,7 @@ PaludisConfig::PaludisConfig(PaludisEnvironment * const e, const std::string & s
std::tr1::shared_ptr<const DepSpec>()));
else
{
- std::tr1::shared_ptr<const PackageDepSpec> a(new PackageDepSpec(*line));
+ std::tr1::shared_ptr<const PackageDepSpec> a(new PackageDepSpec(*line, pds_pm_unspecific));
if (a->package_ptr())
_imp->user_masks[*a->package_ptr()].push_back(a);
else
@@ -562,7 +562,7 @@ PaludisConfig::PaludisConfig(PaludisEnvironment * const e, const std::string & s
std::tr1::shared_ptr<const DepSpec>()));
else
{
- std::tr1::shared_ptr<const PackageDepSpec> a(new PackageDepSpec(*line));
+ std::tr1::shared_ptr<const PackageDepSpec> a(new PackageDepSpec(*line, pds_pm_unspecific));
if (a->package_ptr())
_imp->user_unmasks[*a->package_ptr()].push_back(a);
else
@@ -661,7 +661,7 @@ PaludisConfig::PaludisConfig(PaludisEnvironment * const e, const std::string & s
}
else
{
- std::tr1::shared_ptr<const PackageDepSpec> a(new PackageDepSpec(tokens.at(0)));
+ std::tr1::shared_ptr<const PackageDepSpec> a(new PackageDepSpec(tokens.at(0), pds_pm_unspecific));
for (std::vector<std::string>::const_iterator t(next(tokens.begin())), t_end(tokens.end()) ;
t != t_end ; ++t)
{
diff --git a/paludis/environments/paludis/paludis_environment.cc b/paludis/environments/paludis/paludis_environment.cc
index 608b4953e..45213e177 100644
--- a/paludis/environments/paludis/paludis_environment.cc
+++ b/paludis/environments/paludis/paludis_environment.cc
@@ -714,19 +714,19 @@ PaludisEnvironment::local_package_set(const SetName & s) const
{
Log::get_instance()->message(ll_warning, lc_context, "Line '" + *line + "' in set file '"
+ stringify(ff) + "' does not specify '*' or '?', assuming '*'");
- std::tr1::shared_ptr<PackageDepSpec> spec(new PackageDepSpec(tokens.at(0)));
+ std::tr1::shared_ptr<PackageDepSpec> spec(new PackageDepSpec(tokens.at(0), pds_pm_unspecific));
spec->set_tag(tag);
result->add_child(spec);
}
else if ("*" == tokens.at(0))
{
- std::tr1::shared_ptr<PackageDepSpec> spec(new PackageDepSpec(tokens.at(1)));
+ std::tr1::shared_ptr<PackageDepSpec> spec(new PackageDepSpec(tokens.at(1), pds_pm_unspecific));
spec->set_tag(tag);
result->add_child(spec);
}
else if ("?" == tokens.at(0))
{
- std::tr1::shared_ptr<PackageDepSpec> p(new PackageDepSpec(tokens.at(1)));
+ std::tr1::shared_ptr<PackageDepSpec> p(new PackageDepSpec(tokens.at(1), pds_pm_unspecific));
p->set_tag(tag);
if (p->package_ptr())
diff --git a/paludis/environments/portage/portage_environment.cc b/paludis/environments/portage/portage_environment.cc
index 9d01a3c43..5e349f447 100644
--- a/paludis/environments/portage/portage_environment.cc
+++ b/paludis/environments/portage/portage_environment.cc
@@ -180,7 +180,7 @@ PortageEnvironment::_load_atom_file(const FSEntry & f, I_ i, const std::string &
if (tokens.empty())
continue;
- std::tr1::shared_ptr<PackageDepSpec> p(new PackageDepSpec(tokens.at(0)));
+ std::tr1::shared_ptr<PackageDepSpec> p(new PackageDepSpec(tokens.at(0), pds_pm_unspecific));
if (1 == tokens.size())
{
if (! def_value.empty())
@@ -216,7 +216,7 @@ PortageEnvironment::_load_lined_file(const FSEntry & f, I_ i)
for (LineConfigFile::Iterator line(file.begin()), line_end(file.end()) ;
line != line_end ; ++line)
*i++ = std::tr1::shared_ptr<PackageDepSpec>(new PackageDepSpec(
- strip_trailing(strip_leading(*line, " \t"), " \t")));
+ strip_trailing(strip_leading(*line, " \t"), " \t"), pds_pm_unspecific));
}
}