aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorArtemis Everfree2023-06-08 01:33:01 -0700
committerArtemis Everfree2023-06-08 01:33:01 -0700
commitf28f8c6063dfdee3720a8841cc857df2c911dec8 (patch)
treed28ae84202e328ef087cff85d9c6748ad9b19080 /src
parent65211db63ba1199f09b4c9f27e5eba5ec50d76ac (diff)
actually merge confirm_timeout into merged_settings
Diffstat (limited to '')
-rw-r--r--src/lib.rs5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib.rs b/src/lib.rs
index bf1a6dc..c6f8e03 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -147,10 +147,10 @@ pub fn init_logger(
Ok(())
}
+pub mod cli;
pub mod data;
pub mod deploy;
pub mod push;
-pub mod cli;
#[derive(Debug)]
pub struct CmdOverrides {
@@ -441,6 +441,9 @@ pub fn make_deploy_data<'a, 's>(
if let Some(magic_rollback) = cmd_overrides.magic_rollback {
merged_settings.magic_rollback = Some(magic_rollback);
}
+ if let Some(confirm_timeout) = cmd_overrides.confirm_timeout {
+ merged_settings.confirm_timeout = Some(confirm_timeout);
+ }
DeployData {
node_name,