From 61afd78c4c0eaf06e8079e512975e61179619c86 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 13 Jun 2022 00:17:03 +0100 Subject: [PATCH] cli: Add do_links parameter to setup_table This is to let us only do the ACL. Signed-off-by: Ian Jackson --- cli/clisupport.rs | 5 +++-- cli/forgame.rs | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cli/clisupport.rs b/cli/clisupport.rs index fda18f10..7d6342fc 100644 --- a/cli/clisupport.rs +++ b/cli/clisupport.rs @@ -417,7 +417,8 @@ pub const PLAYER_DEFAULT_PERMS: &[TablePermission] = &[ ]; #[throws(AE)] -pub fn setup_table(_ma: &MainOpts, instance_name: &InstanceName, spec: &TableSpec) +pub fn setup_table(_ma: &MainOpts, instance_name: &InstanceName, + spec: &TableSpec, do_links: bool) -> Vec { let TableSpec { players, player_perms, acl, links } = spec; let mut player_perms = player_perms.clone() @@ -439,7 +440,7 @@ pub fn setup_table(_ma: &MainOpts, instance_name: &InstanceName, spec: &TableSpe let mut insns = vec![]; insns.push(MGI::SetACL { acl }); - insns.push(MGI::SetLinks(links.clone())); + if do_links { insns.push(MGI::SetLinks(links.clone())); } insns } diff --git a/cli/forgame.rs b/cli/forgame.rs index 65112271..7ace4042 100644 --- a/cli/forgame.rs +++ b/cli/forgame.rs @@ -85,7 +85,7 @@ mod reset_game { Err(e) })?; - insns.extend(setup_table(&ma, &instance_name, &table_spec)?); + insns.extend(setup_table(&ma, &instance_name, &table_spec, true)?); } if args.bundles_only || args.bundles.len() != 0 { -- 2.30.2