aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2010-06-20 19:44:23 +0100
committerAvatar David Leverton <levertond@googlemail.com> 2010-06-20 19:44:23 +0100
commitc25714fc4b379fb9c9cd057b5f3adfc3c0746be4 (patch)
tree8798eab13b3b49e303a3f8842ecc4418fe2fc9fb
parent4e94a46f493e7818d9acee24cb00f087aa376e6f (diff)
downloadpaludis-c25714fc4b379fb9c9cd057b5f3adfc3c0746be4.tar.gz
paludis-c25714fc4b379fb9c9cd057b5f3adfc3c0746be4.tar.xz
Revert "Default to being a bit less lazy"
This reverts commit f91f8744cdc3d0517aee34e7b393b44280375734. I think --keep if-possible makes more sense by default, and gives a clearer distinction in use cases between default and --complete.
-rw-r--r--src/clients/cave/cmd_resolve_cmdline.cc11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/clients/cave/cmd_resolve_cmdline.cc b/src/clients/cave/cmd_resolve_cmdline.cc
index 91958f6..59053d6 100644
--- a/src/clients/cave/cmd_resolve_cmdline.cc
+++ b/src/clients/cave/cmd_resolve_cmdline.cc
@@ -110,11 +110,12 @@ ResolveCommandLineResolutionOptions::ResolveCommandLineResolutionOptions(args::A
("never", 'n', "Never")
("if-transient", 't', "Only if the installed package is transient "
"(e.g. from 'importare') (default if --everything)")
- ("if-same", 's', "If it is the same as the proposed replacement")
+ ("if-same", 's', "If it is the same as the proposed replacement "
+ "(default if --complete)")
("if-same-version", 'v', "If it is the same version as the proposed replacement")
- ("if-possible", 'p', "If possible (default if --lazy)"),
+ ("if-possible", 'p', "If possible"),
- "if-same"
+ "if-possible"
),
a_reinstall_scm(&g_keep_options, "reinstall-scm", 'R',
"Select whether to reinstall SCM packages that would otherwise be kept",
@@ -367,8 +368,6 @@ ResolveCommandLineResolutionOptions::apply_shortcuts()
if (a_lazy.specified())
{
- if (! a_keep.specified())
- a_keep.set_argument("if-possible");
if (! a_target_slots.specified())
a_target_slots.set_argument("best");
if (! a_slots.specified())
@@ -379,6 +378,8 @@ ResolveCommandLineResolutionOptions::apply_shortcuts()
if (a_complete.specified())
{
+ if (! a_keep.specified())
+ a_keep.set_argument("if-same");
if (! a_target_slots.specified())
a_target_slots.set_argument("all");
if (! a_slots.specified())