aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-09-10 09:05:00 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-09-10 02:59:39 +0100
commit1f43c491ea17012d0d646eef9015552130013a92 (patch)
tree5f794b976470691d60ef4e83665597e25265cf4b
parentf068881f850b60ec2df615e8d518df88b1ec7ebe (diff)
downloadpaludis-1f43c491ea17012d0d646eef9015552130013a92.tar.gz
paludis-1f43c491ea17012d0d646eef9015552130013a92.tar.xz
better defaults for scm reinstalls
-rw-r--r--src/clients/cave/cmd_resolve.cc4
-rw-r--r--src/clients/cave/cmd_resolve_cmdline.cc6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/clients/cave/cmd_resolve.cc b/src/clients/cave/cmd_resolve.cc
index 6373e2e..40c0c7f 100644
--- a/src/clients/cave/cmd_resolve.cc
+++ b/src/clients/cave/cmd_resolve.cc
@@ -604,8 +604,6 @@ ResolveCommand::run(
cmdline.resolution_options.a_target_slots.set_argument("best");
if (! cmdline.resolution_options.a_slots.specified())
cmdline.resolution_options.a_slots.set_argument("best");
- if (! cmdline.resolution_options.a_reinstall_scm.specified())
- cmdline.resolution_options.a_reinstall_scm.set_argument("never");
if (! cmdline.resolution_options.a_ignore_installed_dependencies.specified())
cmdline.resolution_options.a_ignore_installed_dependencies.set_specified(true);
}
@@ -620,6 +618,8 @@ ResolveCommand::run(
cmdline.resolution_options.a_slots.set_argument("all");
if (! cmdline.resolution_options.a_follow_installed_build_dependencies.specified())
cmdline.resolution_options.a_follow_installed_build_dependencies.set_specified(true);
+ if (! cmdline.resolution_options.a_reinstall_scm.specified())
+ cmdline.resolution_options.a_reinstall_scm.set_argument("weekly");
}
if (cmdline.resolution_options.a_everything.specified())
diff --git a/src/clients/cave/cmd_resolve_cmdline.cc b/src/clients/cave/cmd_resolve_cmdline.cc
index d35d446..ebf10cc 100644
--- a/src/clients/cave/cmd_resolve_cmdline.cc
+++ b/src/clients/cave/cmd_resolve_cmdline.cc
@@ -98,9 +98,9 @@ ResolveCommandLineResolutionOptions::ResolveCommandLineResolutionOptions(args::A
args::EnumArg::EnumArgOptions
("always", 'a', "Always")
("daily", 'd', "If they were installed more than a day ago")
- ("weekly", 'w', "If they were installed more than a week ago")
- ("never", 'n', "Never (default if --lazy)"),
- "weekly"
+ ("weekly", 'w', "If they were installed more than a week ago (default if --complete)")
+ ("never", 'n', "Never"),
+ "never"
),
// a_reinstall_for_removals(&g_reinstall_options, "reinstall-for-removals", '\0',
// "Select whether to rebuild packages if rebuilding would avoid an unsafe removal", true),