aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-12-08 16:48:02 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-12-08 20:33:47 +0000
commita45befeb03430d2adcb9a92a77d6a97d565fa761 (patch)
tree6b03254118fad73d182ea1c46777c3930a1dd806
parenta28909960fd86c8107041e3784fbbfd160bcae42 (diff)
downloadpaludis-a45befeb03430d2adcb9a92a77d6a97d565fa761.tar.gz
paludis-a45befeb03430d2adcb9a92a77d6a97d565fa761.tar.xz
cave resolve --one-binary-per-slot
-rw-r--r--src/clients/cave/resolve_cmdline.cc2
-rw-r--r--src/clients/cave/resolve_cmdline.hh1
-rw-r--r--src/clients/cave/resolve_common.cc1
3 files changed, 4 insertions, 0 deletions
diff --git a/src/clients/cave/resolve_cmdline.cc b/src/clients/cave/resolve_cmdline.cc
index 29531a5..48e5882 100644
--- a/src/clients/cave/resolve_cmdline.cc
+++ b/src/clients/cave/resolve_cmdline.cc
@@ -262,6 +262,8 @@ ResolveCommandLineResolutionOptions::ResolveCommandLineResolutionOptions(args::A
("build", 'b', "Send only build dependencies to /")
("none", 'n', "Don't send dependencies to / at all"),
"all"),
+ a_one_binary_per_slot(&g_destination_options, "one-binary-per-slot", '\0', "When building a binary package, "
+ "remove other versions in the same repository and slot (as would be done for non-binary packages).", true),
// g_query_options(this, "Query Options", "Query the user interactively when making decisions. "
// "If only --query is specified, prompt for everything. Otherwise, prompt only for the specified decisions."),
diff --git a/src/clients/cave/resolve_cmdline.hh b/src/clients/cave/resolve_cmdline.hh
index 41f441f..a25b447 100644
--- a/src/clients/cave/resolve_cmdline.hh
+++ b/src/clients/cave/resolve_cmdline.hh
@@ -98,6 +98,7 @@ namespace paludis
args::EnumArg a_make_dependencies;
args::StringSetArg a_via_binary;
args::EnumArg a_dependencies_to_slash;
+ args::SwitchArg a_one_binary_per_slot;
// args::ArgsGroup g_query_options;
// args::SwitchArg a_query;
diff --git a/src/clients/cave/resolve_common.cc b/src/clients/cave/resolve_common.cc
index 1992599..32a7c42 100644
--- a/src/clients/cave/resolve_common.cc
+++ b/src/clients/cave/resolve_common.cc
@@ -712,6 +712,7 @@ paludis::cave::resolve_common(
confirm_helper.add_allowed_to_break_spec(parse_user_package_dep_spec(*i, env.get(), { updso_allow_wildcards }));
FindReplacingHelper find_replacing_helper(env.get());
+ find_replacing_helper.set_one_binary_per_slot(resolution_options.a_one_binary_per_slot.specified());
FindRepositoryForHelper find_repository_for_helper(env.get());