aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-01-25 16:14:12 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-01-25 16:14:12 +0000
commitf91f8744cdc3d0517aee34e7b393b44280375734 (patch)
tree965cbe2acf98a6a17825b7d3662eb9329b99d214
parentc31721be38093cb1d849153d28735c166410011a (diff)
downloadpaludis-f91f8744cdc3d0517aee34e7b393b44280375734.tar.gz
paludis-f91f8744cdc3d0517aee34e7b393b44280375734.tar.xz
Default to being a bit less lazy
-rw-r--r--src/clients/cave/cmd_resolve_cmdline.cc11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/clients/cave/cmd_resolve_cmdline.cc b/src/clients/cave/cmd_resolve_cmdline.cc
index 42a2e17..e795419 100644
--- a/src/clients/cave/cmd_resolve_cmdline.cc
+++ b/src/clients/cave/cmd_resolve_cmdline.cc
@@ -88,12 +88,11 @@ 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 "
- "(default if --complete)")
+ ("if-same", 's', "If it is the same as the proposed replacement")
("if-same-version", 'v', "If it is the same version as the proposed replacement")
- ("if-possible", 'p', "If possible"),
+ ("if-possible", 'p', "If possible (default if --lazy)"),
- "if-possible"
+ "if-same"
),
a_reinstall_scm(&g_keep_options, "reinstall-scm", 'R',
"Select whether to reinstall SCM packages that would otherwise be kept",
@@ -351,6 +350,8 @@ 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())
@@ -361,8 +362,6 @@ 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())