diff options
Diffstat (limited to 'src/clients/cave')
| -rw-r--r-- | src/clients/cave/cmd_fix_linkage.cc | 6 | ||||
| -rw-r--r-- | src/clients/cave/cmd_import.cc | 2 | ||||
| -rw-r--r-- | src/clients/cave/cmd_purge.cc | 2 | ||||
| -rw-r--r-- | src/clients/cave/cmd_sync.cc | 2 | ||||
| -rw-r--r-- | src/clients/cave/resolve_cmdline.cc | 6 |
5 files changed, 9 insertions, 9 deletions
diff --git a/src/clients/cave/cmd_fix_linkage.cc b/src/clients/cave/cmd_fix_linkage.cc index b690b1d6d..051e2fe02 100644 --- a/src/clients/cave/cmd_fix_linkage.cc +++ b/src/clients/cave/cmd_fix_linkage.cc @@ -144,8 +144,8 @@ 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.resolution_options.a_lazy.set_specified(args::aos_weak); + resolve_cmdline.execution_options.a_preserve_world.set_specified(args::aos_weak); resolve_cmdline.run(cmdline.separate_after_dashes_args(), "CAVE", "CAVE_RESOLVE_OPTIONS", "CAVE_RESOLVE_CMDLINE"); @@ -162,7 +162,7 @@ FixLinkageCommand::run( resolve_cmdline.resolution_options.verify(env); if (cmdline.a_execute.specified()) - resolve_cmdline.resolution_options.a_execute.set_specified(true); + resolve_cmdline.resolution_options.a_execute.set_specified(args::aos_specified); auto libraries(std::make_shared<Sequence<std::string>>()); for (auto l(cmdline.a_libraries.begin_args()), l_end(cmdline.a_libraries.end_args()) ; diff --git a/src/clients/cave/cmd_import.cc b/src/clients/cave/cmd_import.cc index d7a59a638..55a01cf8f 100644 --- a/src/clients/cave/cmd_import.cc +++ b/src/clients/cave/cmd_import.cc @@ -300,7 +300,7 @@ ImportCommand::run( resolve_cmdline.resolution_options.verify(env); if (cmdline.a_execute.specified()) - resolve_cmdline.resolution_options.a_execute.set_specified(true); + resolve_cmdline.resolution_options.a_execute.set_specified(args::aos_specified); std::shared_ptr<Sequence<std::pair<std::string, std::string> > > targets(std::make_shared<Sequence<std::pair<std::string, std::string> >>()); targets->push_back(std::make_pair(stringify((*ids->begin())->name()), "")); diff --git a/src/clients/cave/cmd_purge.cc b/src/clients/cave/cmd_purge.cc index b67dc9592..1a252bac0 100644 --- a/src/clients/cave/cmd_purge.cc +++ b/src/clients/cave/cmd_purge.cc @@ -104,7 +104,7 @@ PurgeCommand::run( cmdline.resolution_options->apply_shortcuts(); cmdline.resolution_options->verify(env); - cmdline.resolution_options->a_purge.set_specified(true); + cmdline.resolution_options->a_purge.set_specified(args::aos_weak); cmdline.resolution_options->a_purge.add_argument("*/*"); return resolve_common(env, *cmdline.resolution_options, *cmdline.execution_options, *cmdline.display_options, diff --git a/src/clients/cave/cmd_sync.cc b/src/clients/cave/cmd_sync.cc index 87330d721..a12f060ce 100644 --- a/src/clients/cave/cmd_sync.cc +++ b/src/clients/cave/cmd_sync.cc @@ -390,7 +390,7 @@ SyncCommand::run( repos.insert((*p)->name()); if (1 == repos.size()) - cmdline.a_sequential.set_specified(true); + cmdline.a_sequential.set_specified(args::aos_weak); cout << fuc(fs_heading(), fv<'s'>("Starting sync")); diff --git a/src/clients/cave/resolve_cmdline.cc b/src/clients/cave/resolve_cmdline.cc index ba9cc8f9a..82abf30f6 100644 --- a/src/clients/cave/resolve_cmdline.cc +++ b/src/clients/cave/resolve_cmdline.cc @@ -471,7 +471,7 @@ ResolveCommandLineResolutionOptions::apply_shortcuts() if (! a_slots.specified()) a_slots.set_argument("best"); if (! a_no_follow_installed_dependencies.specified()) - a_no_follow_installed_dependencies.set_specified(true); + a_no_follow_installed_dependencies.set_specified(args::aos_weak); } if (a_complete.specified()) @@ -483,7 +483,7 @@ ResolveCommandLineResolutionOptions::apply_shortcuts() if (! a_slots.specified()) a_slots.set_argument("all"); if (! a_follow_installed_build_dependencies.specified()) - a_follow_installed_build_dependencies.set_specified(true); + a_follow_installed_build_dependencies.set_specified(args::aos_weak); if (! a_reinstall_scm.specified()) a_reinstall_scm.set_argument("weekly"); } @@ -499,7 +499,7 @@ ResolveCommandLineResolutionOptions::apply_shortcuts() if (! a_slots.specified()) a_slots.set_argument("all"); if (! a_follow_installed_build_dependencies.specified()) - a_follow_installed_build_dependencies.set_specified(true); + a_follow_installed_build_dependencies.set_specified(args::aos_weak); } } |