aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-06-14 20:40:55 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-06-15 10:42:04 +0100
commitb1d99a312a499e6c3596ab61f91b1632e7049b2a (patch)
treee1739457a834816d422880220f6e2ad38c2d4f73
parente53ad79f17aed32bd5b95c64d9976af2cf59dd39 (diff)
downloadpaludis-b1d99a312a499e6c3596ab61f91b1632e7049b2a.tar.gz
paludis-b1d99a312a499e6c3596ab61f91b1632e7049b2a.tar.xz
Make use of filters to improve new user_dep_spec disambiguation (continued)
-rw-r--r--paludis/install_task.cc3
-rw-r--r--paludis/uninstall_task.cc3
-rw-r--r--src/clients/paludis/do_config.cc3
-rw-r--r--src/clients/paludis/do_contents.cc3
-rw-r--r--src/clients/paludis/do_executables.cc3
5 files changed, 10 insertions, 5 deletions
diff --git a/paludis/install_task.cc b/paludis/install_task.cc
index 88b6a19..9cbf4e1 100644
--- a/paludis/install_task.cc
+++ b/paludis/install_task.cc
@@ -385,7 +385,8 @@ InstallTask::_add_target(const std::string & target)
try
{
std::tr1::shared_ptr<PackageDepSpec> spec(new PackageDepSpec(parse_user_package_dep_spec(target,
- _imp->env, UserPackageDepSpecOptions() + updso_allow_wildcards + updso_throw_if_set)));
+ _imp->env, UserPackageDepSpecOptions() + updso_allow_wildcards + updso_throw_if_set,
+ filter::SupportsAction<InstallAction>())));
if (_imp->had_set_targets)
throw HadBothPackageAndSetTargets();
diff --git a/paludis/uninstall_task.cc b/paludis/uninstall_task.cc
index f7226d8..0b81455 100644
--- a/paludis/uninstall_task.cc
+++ b/paludis/uninstall_task.cc
@@ -161,7 +161,8 @@ UninstallTask::add_target(const std::string & target)
try
{
std::tr1::shared_ptr<PackageDepSpec> pds(new PackageDepSpec(parse_user_package_dep_spec(
- target, _imp->env, UserPackageDepSpecOptions() + updso_throw_if_set)));
+ target, _imp->env, UserPackageDepSpecOptions() + updso_throw_if_set,
+ filter::SupportsAction<UninstallAction>())));
if (_imp->had_set_targets)
throw HadBothPackageAndSetTargets();
diff --git a/src/clients/paludis/do_config.cc b/src/clients/paludis/do_config.cc
index 1c76786..6bb8623 100644
--- a/src/clients/paludis/do_config.cc
+++ b/src/clients/paludis/do_config.cc
@@ -71,7 +71,8 @@ namespace
Context local_context("When handling query '" + target + "':");
std::tr1::shared_ptr<PackageDepSpec> spec(
- new PackageDepSpec(parse_user_package_dep_spec(target, env.get(), UserPackageDepSpecOptions())));
+ new PackageDepSpec(parse_user_package_dep_spec(target, env.get(), UserPackageDepSpecOptions(),
+ filter::InstalledAtRoot(env->root()))));
std::tr1::shared_ptr<const PackageIDSequence> entries(
(*env)[selection::AllVersionsUnsorted(generator::Matches(*spec) | filter::InstalledAtRoot(env->root()))]);
diff --git a/src/clients/paludis/do_contents.cc b/src/clients/paludis/do_contents.cc
index 2bc2744..b75cadb 100644
--- a/src/clients/paludis/do_contents.cc
+++ b/src/clients/paludis/do_contents.cc
@@ -95,7 +95,8 @@ do_one_contents(
Context local_context("When handling query '" + q + "':");
std::tr1::shared_ptr<PackageDepSpec> spec(new PackageDepSpec(
- parse_user_package_dep_spec(q, env.get(), UserPackageDepSpecOptions())));
+ parse_user_package_dep_spec(q, env.get(), UserPackageDepSpecOptions(),
+ filter::InstalledAtRoot(env->root()))));
std::tr1::shared_ptr<const PackageIDSequence> entries(
(*env)[selection::AllVersionsSorted(generator::Matches(*spec) | filter::InstalledAtRoot(env->root()))]);
diff --git a/src/clients/paludis/do_executables.cc b/src/clients/paludis/do_executables.cc
index 7a94a0e..00d88cd 100644
--- a/src/clients/paludis/do_executables.cc
+++ b/src/clients/paludis/do_executables.cc
@@ -125,7 +125,8 @@ do_one_executables(
Context local_context("When handling query '" + q + "':");
std::tr1::shared_ptr<PackageDepSpec> spec(new PackageDepSpec(
- parse_user_package_dep_spec(q, env.get(), UserPackageDepSpecOptions())));
+ parse_user_package_dep_spec(q, env.get(), UserPackageDepSpecOptions(),
+ filter::InstalledAtRoot(env->root()))));
std::tr1::shared_ptr<const PackageIDSequence> entries(
(*env)[selection::AllVersionsSorted(generator::Matches(*spec) | filter::InstalledAtRoot(env->root()))]);