aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-02-06 09:19:46 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-02-06 09:19:46 +0000
commitd2fb5467e4365e11c8c0fe4ef5012e91ff23d771 (patch)
tree4cd4935436e884fa7485328fdbfa740b189c0b82
parent4d51b804ac6ffe8521704cc2cbe73161c5aca0e5 (diff)
downloadpaludis-d2fb5467e4365e11c8c0fe4ef5012e91ff23d771.tar.gz
paludis-d2fb5467e4365e11c8c0fe4ef5012e91ff23d771.tar.xz
--discard* -> --ignore*, and add -iI and -tT
-rw-r--r--src/clients/cave/cmd_resolve_cmdline.cc8
-rw-r--r--src/clients/cave/cmd_resolve_cmdline.hh4
-rw-r--r--src/clients/cave/resolve_common.cc8
3 files changed, 10 insertions, 10 deletions
diff --git a/src/clients/cave/cmd_resolve_cmdline.cc b/src/clients/cave/cmd_resolve_cmdline.cc
index 052d55b..223fa3f 100644
--- a/src/clients/cave/cmd_resolve_cmdline.cc
+++ b/src/clients/cave/cmd_resolve_cmdline.cc
@@ -160,12 +160,12 @@ ResolveCommandLineResolutionOptions::ResolveCommandLineResolutionOptions(args::A
("display", "Display recommendations, but do not take them unless explicitly told to do so")
("take", "Take all recommendations"),
"take"),
- a_take(&g_suggestion_options, "take", '\0', "Take any suggestion matching the supplied package specification"
+ a_take(&g_suggestion_options, "take", 't', "Take any suggestion matching the supplied package specification"
" (e.g. --take 'app-vim/securemodelines' or --take 'app-vim/*')"),
- a_take_from(&g_suggestion_options, "take-from", '\0', "Take all suggestions made by any package matching the "
+ a_take_from(&g_suggestion_options, "take-from", 'T', "Take all suggestions made by any package matching the "
"supplied package specification"),
- a_discard(&g_suggestion_options, "discard", '\0', "Discard any suggestion matching the supplied package specification"),
- a_discard_from(&g_suggestion_options, "discard-from", '\0', "Discard all suggestions made by any package matching the "
+ a_ignore(&g_suggestion_options, "ignore", 'i', "Discard any suggestion matching the supplied package specification"),
+ a_ignore_from(&g_suggestion_options, "ignore-from", 'I', "Discard all suggestions made by any package matching the "
"supplied package specification"),
// g_package_options(this, "Package Selection Options", "Control which packages are selected."),
diff --git a/src/clients/cave/cmd_resolve_cmdline.hh b/src/clients/cave/cmd_resolve_cmdline.hh
index 4cc80e9..1fd9b11 100644
--- a/src/clients/cave/cmd_resolve_cmdline.hh
+++ b/src/clients/cave/cmd_resolve_cmdline.hh
@@ -70,8 +70,8 @@ namespace paludis
args::EnumArg a_recommendations;
args::StringSetArg a_take;
args::StringSetArg a_take_from;
- args::StringSetArg a_discard;
- args::StringSetArg a_discard_from;
+ args::StringSetArg a_ignore;
+ args::StringSetArg a_ignore_from;
// args::ArgsGroup g_package_options;
// args::StringSetArg a_prefer;
diff --git a/src/clients/cave/resolve_common.cc b/src/clients/cave/resolve_common.cc
index b7eb14f..098a5fe 100644
--- a/src/clients/cave/resolve_common.cc
+++ b/src/clients/cave/resolve_common.cc
@@ -827,8 +827,8 @@ namespace
return true;
}
- for (args::StringSetArg::ConstIterator a(resolution_options.a_discard.begin_args()),
- a_end(resolution_options.a_discard.end_args()) ;
+ for (args::StringSetArg::ConstIterator a(resolution_options.a_ignore.begin_args()),
+ a_end(resolution_options.a_ignore.end_args()) ;
a != a_end ; ++a)
{
PackageDepSpec user_spec(parse_user_package_dep_spec(*a, env, UserPackageDepSpecOptions() + updso_allow_wildcards));
@@ -837,8 +837,8 @@ namespace
return false;
}
- for (args::StringSetArg::ConstIterator a(resolution_options.a_discard_from.begin_args()),
- a_end(resolution_options.a_discard_from.end_args()) ;
+ for (args::StringSetArg::ConstIterator a(resolution_options.a_ignore_from.begin_args()),
+ a_end(resolution_options.a_ignore_from.end_args()) ;
a != a_end ; ++a)
{
PackageDepSpec user_spec(parse_user_package_dep_spec(*a, env, UserPackageDepSpecOptions() + updso_allow_wildcards));