aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-04-25 13:47:10 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-04-25 13:47:10 +0100
commit88f31ae86dbcbb537c8aa3a0cf6242eb2aa5e8b0 (patch)
tree3f562a9b14c222e1eb24853e4e80a4a0c4f9299c
parent43bfea0710c66113543305cfa2181dacf8df3df2 (diff)
downloadpaludis-88f31ae86dbcbb537c8aa3a0cf6242eb2aa5e8b0.tar.gz
paludis-88f31ae86dbcbb537c8aa3a0cf6242eb2aa5e8b0.tar.xz
cave fix-linkage defaults to -1z
Fixes: ticket:874
-rw-r--r--src/clients/cave/cmd_fix_linkage.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/clients/cave/cmd_fix_linkage.cc b/src/clients/cave/cmd_fix_linkage.cc
index 18f1171..dbe54ef 100644
--- a/src/clients/cave/cmd_fix_linkage.cc
+++ b/src/clients/cave/cmd_fix_linkage.cc
@@ -77,6 +77,8 @@ namespace
"valid for 'cave resolve' may be passed as a parameter following a '--'. For example, "
"'cave fix-linkage --library foo.so.1 cat/pkg -- --lazy' may be useful. As a "
"special case, '--execute' does not require a '--'.");
+ add_note("By default, '--lazy' and '--preserve-world' are both provided automatically. To "
+ "override this, use '-- --no-lazy --no-preserve-world'.");
}
std::string app_name() const
@@ -141,6 +143,9 @@ FixLinkageCommand::run(
cmdline.run(args, "CAVE", "CAVE_FIX_LINKAGE_OPTIONS", "CAVE_FIX_LINKAGE_CMDLINE",
args::ArgsHandlerOptions() + args::aho_separate_after_dashes);
+
+ resolve_cmdline.resolution_options.a_lazy.set_specified(true);
+ resolve_cmdline.execution_options.a_preserve_world.set_specified(true);
resolve_cmdline.run(cmdline.separate_after_dashes_args(),
"CAVE", "CAVE_RESOLVE_OPTIONS", "CAVE_RESOLVE_CMDLINE");