aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2008-06-15 14:15:33 +0100
committerAvatar David Leverton <levertond@googlemail.com> 2008-06-15 14:15:33 +0100
commitee2b9386d5772a889d17662679f2375a27963265 (patch)
tree113c3d0bc612835814856f8463564dcd2dccbc52
parent05e649d809b4f502c97c41e4270986988549e876 (diff)
downloadpaludis-ee2b9386d5772a889d17662679f2375a27963265.tar.gz
paludis-ee2b9386d5772a889d17662679f2375a27963265.tar.xz
Use the new parsing options in more places.
-rw-r--r--paludis/environments/portage/portage_environment.cc4
-rw-r--r--paludis/repositories/unpackaged/dep_parser.cc2
2 files changed, 3 insertions, 3 deletions
diff --git a/paludis/environments/portage/portage_environment.cc b/paludis/environments/portage/portage_environment.cc
index 99f7227..13ae9e4 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), this, UserPackageDepSpecOptions())));
+ tokens.at(0), this, UserPackageDepSpecOptions() + updso_no_disambiguation)));
if (reject_additional && p->additional_requirements_ptr())
{
Log::get_instance()->message("portage_environment.bad_spec", ll_warning, lc_context)
@@ -373,7 +373,7 @@ PortageEnvironment::_load_lined_file(const FSEntry & f, I_ i)
line != line_end ; ++line)
*i++ = std::tr1::shared_ptr<PackageDepSpec>(new PackageDepSpec(
parse_user_package_dep_spec(strip_trailing(strip_leading(*line, " \t"), " \t"),
- this, UserPackageDepSpecOptions())));
+ this, UserPackageDepSpecOptions() + updso_no_disambiguation)));
}
}
diff --git a/paludis/repositories/unpackaged/dep_parser.cc b/paludis/repositories/unpackaged/dep_parser.cc
index 3818eda..f30e366 100644
--- a/paludis/repositories/unpackaged/dep_parser.cc
+++ b/paludis/repositories/unpackaged/dep_parser.cc
@@ -51,7 +51,7 @@ DepParser::parse(const Environment * const env, const std::string & s)
std::tr1::shared_ptr<TreeLeaf<DependencySpecTree, PackageDepSpec> > spec(
new TreeLeaf<DependencySpecTree, PackageDepSpec>(std::tr1::shared_ptr<PackageDepSpec>(
- new PackageDepSpec(parse_user_package_dep_spec(a, env, UserPackageDepSpecOptions())))));
+ new PackageDepSpec(parse_user_package_dep_spec(a, env, UserPackageDepSpecOptions() + updso_no_disambiguation)))));
result->add(spec);
}