From c2ec1ce9943f2bf2efd8c705e786c5cb659a2499 Mon Sep 17 00:00:00 2001 From: Robbert van der Helm Date: Fri, 23 Oct 2020 01:48:26 +0200 Subject: [PATCH] [yabridgectl] Fix removing non-existent directory As mentioned in #46. --- CHANGELOG.md | 2 ++ tools/yabridgectl/src/main.rs | 9 +++------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e463d458..c0b7ade5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,8 @@ Versioning](https://semver.org/spec/v2.0.0.html). .so files as usual. - Added a `--force` option to `yabridgectl sync` to always recreate existing .so files like in previous versions. +- Fixed a regression from yabridgectl 1.6.1 that prevented you from removing + directories that no longer exist using `yabridgectl rm`. ## [1.7.0] - 2020-10-13 diff --git a/tools/yabridgectl/src/main.rs b/tools/yabridgectl/src/main.rs index 86f3eb6b..3c419ce1 100644 --- a/tools/yabridgectl/src/main.rs +++ b/tools/yabridgectl/src/main.rs @@ -139,12 +139,9 @@ fn main() -> Result<()> { .value_of_t_or_exit::("path") .canonicalize()?, ), - ("rm", Some(options)) => actions::remove_directory( - &mut config, - &options - .value_of_t_or_exit::("path") - .canonicalize()?, - ), + ("rm", Some(options)) => { + actions::remove_directory(&mut config, &options.value_of_t_or_exit::("path")) + } ("list", _) => actions::list_directories(&config), ("status", _) => actions::show_status(&config), ("set", Some(options)) => actions::set_settings(