aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-03-27 21:08:40 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-03-27 21:08:40 +0100
commit3f477c003c15ff036b42cc8635a6c10e65dc0918 (patch)
tree1108c411e043852350e54c746eac7f3f97c7a6b7
parentfa974e04f92039518f382384bc2ee29e967e6d1d (diff)
downloadpaludis-3f477c003c15ff036b42cc8635a6c10e65dc0918.tar.gz
paludis-3f477c003c15ff036b42cc8635a6c10e65dc0918.tar.xz
cave resolve -D is now reinstall-dependents-of
-rw-r--r--src/clients/cave/resolve_cmdline.cc16
-rw-r--r--src/clients/cave/resolve_cmdline.hh3
2 files changed, 2 insertions, 17 deletions
diff --git a/src/clients/cave/resolve_cmdline.cc b/src/clients/cave/resolve_cmdline.cc
index 204171b..ecdcc33 100644
--- a/src/clients/cave/resolve_cmdline.cc
+++ b/src/clients/cave/resolve_cmdline.cc
@@ -104,7 +104,7 @@ ResolveCommandLineResolutionOptions::ResolveCommandLineResolutionOptions(args::A
"matched by this option, the block will instead only block the installed dependent "
"package, so if reinstalling or upgrading the package will make it no longer be dependent "
"then this will be done instead."),
- a_reinstall_dependents_of(&g_dependent_options, "reinstall-dependents-of", '\0', /* todo: 'D' */
+ a_reinstall_dependents_of(&g_dependent_options, "reinstall-dependents-of", 'D',
"Force any installed package that is dependent upon any installed package matching the "
"supplied spec to be reinstalled. May be specified multiple times. May be combined with "
"--not-usable to obtain a particular ordering. Note that a target must still be specified "
@@ -298,12 +298,7 @@ ResolveCommandLineResolutionOptions::ResolveCommandLineResolutionOptions(args::A
g_dump_options(this, "Dump Options", "Dump the resolver's state to stdout after completion, or when an "
"error occurs. For debugging purposes; produces rather a lot of noise."),
a_dump(&g_dump_options, "dump", '\0', "Dump debug output", true),
- a_dump_restarts(&g_dump_options, "dump-restarts", '\0', "Dump restarts", true),
-
- g_deprecated_options(this, "Deprecated Options", "Deprecated options. These will be removed or reused for "
- "other commands in later versions."),
- a_deprecated_d(&g_deprecated_options, "", 'D', "Deprecated short option for --" + a_follow_installed_build_dependencies.long_name()
- + " / -" + a_follow_installed_build_dependencies.short_name(), false)
+ a_dump_restarts(&g_dump_options, "dump-restarts", '\0', "Dump restarts", true)
{
}
@@ -498,13 +493,6 @@ ResolveCommandLineResolutionOptions::apply_shortcuts()
if (! a_follow_installed_build_dependencies.specified())
a_follow_installed_build_dependencies.set_specified(true);
}
-
- if (a_deprecated_d.specified())
- {
- Log::get_instance()->message("cave.resolve.d_deprecated", ll_warning, lc_context)
- << "Use of -D is deprecated and will mean something else in the future. Use -B instead.";
- a_no_follow_installed_dependencies.set_specified(true);
- }
}
void
diff --git a/src/clients/cave/resolve_cmdline.hh b/src/clients/cave/resolve_cmdline.hh
index 8ee7b02..74237b3 100644
--- a/src/clients/cave/resolve_cmdline.hh
+++ b/src/clients/cave/resolve_cmdline.hh
@@ -116,9 +116,6 @@ namespace paludis
args::SwitchArg a_dump;
args::SwitchArg a_dump_restarts;
- args::ArgsGroup g_deprecated_options;
- args::SwitchArg a_deprecated_d;
-
void apply_shortcuts();
void verify(const std::shared_ptr<const Environment> & env);
};