From dfe55ed46182c9107f476526f191494cf4a473dc Mon Sep 17 00:00:00 2001 From: NeverBehave Date: Sat, 25 Jun 2022 23:52:39 -0700 Subject: [PATCH] fix: rename no-substitutes -> no-substitute Fixes #59. --- manual/src/release-notes.md | 1 + src/command/apply.rs | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/manual/src/release-notes.md b/manual/src/release-notes.md index 9ca8f57..d6d00ad 100644 --- a/manual/src/release-notes.md +++ b/manual/src/release-notes.md @@ -8,6 +8,7 @@ - Impure overlays are no longer imported by default if a path is specified in `meta.nixpkgs` ([#39](https://github.com/zhaofengli/colmena/issues/39)) - GC roots are now created right after the builds are complete, as opposed to after activation. - The [`meta.allowApplyAll`](./reference/meta.md#allowapplyall) option has been added. If set to false, deployments without a node filter (`--on`) are disallowed. +- The `--no-substitutes` option under the `apply` subcommand has been renamed to `--no-substitute` ([#59](https://github.com/zhaofengli/colmena/issues/59)). ## [Release 0.3.0](https://github.com/zhaofengli/colmena/releases/tag/v0.3.0) (2022/04/27) diff --git a/src/command/apply.rs b/src/command/apply.rs index ba6437d..281c6a4 100644 --- a/src/command/apply.rs +++ b/src/command/apply.rs @@ -86,8 +86,9 @@ To upload keys without building or deploying the rest of the configuration, use .help("Reboot nodes after activation") .long_help("Reboots nodes after activation and waits for them to come back up.") .takes_value(false)) - .arg(Arg::new("no-substitutes") - .long("no-substitutes") + .arg(Arg::new("no-substitute") + .long("no-substitute") + .alias("no-substitutes") .help("Do not use substitutes") .long_help("Disables the use of substituters when copying closures to the remote host.") .takes_value(false)) @@ -176,7 +177,7 @@ pub async fn run(_global_args: &ArgMatches, local_args: &ArgMatches) -> Result<( // FIXME: Configure limits let options = { let mut options = Options::default(); - options.set_substituters_push(!local_args.is_present("no-substitutes")); + options.set_substituters_push(!local_args.is_present("no-substitute")); options.set_gzip(!local_args.is_present("no-gzip")); options.set_upload_keys(!local_args.is_present("no-keys")); options.set_reboot(local_args.is_present("reboot"));