From 0a2ec1ec96832e798dfd376d996c0604cb38439f Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 19 Feb 2021 09:09:23 +0100 Subject: Implement patch-path rewriting This patch ensures that pathes for patches are always relative to the repository root, when loading the packages layered from the repository. The problem is well described in the comment in the code, so this commit message ends here. This patch was written using an proposed feature for the config-rs dependency: https://github.com/mehcode/config-rs/pull/165 This PR added a `Config::get_value_mut()` function and exported the `config::value::ValueKind` type in config-rs public API. Signed-off-by: Matthias Beyer Tested-by: Matthias Beyer --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml index 2ca07fe..ba5f57f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ chrono = "0.4" clap = "3.0.0-beta.2" clap_generate = "3.0.0-beta.2" colored = "2" -config = "0.10" +config = { git = "https://github.com/matthiasbeyer/config-rs", branch = "get-value-mut" } csv = "1.1" daggy = { version = "0.7", features = [ "serde" ] } dialoguer = "0.7" -- cgit v1.2.3 From 23489e5e9a39e6dbf0cdd4e81c9a5c273905bdfd Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 9 Mar 2021 19:12:39 +0100 Subject: Re-write patch postprocessing This patch rewrites patch post-processing with a new setter in the config-rs crate: Config::set_once() That is introduced on a PR I've written for the crate. The PR: https://github.com/mehcode/config-rs/pull/172 The new function is more likely to land on the config-rs master branch than the old one, as it does not introduce more exported types from the config-rs crate. Signed-off-by: Matthias Beyer Tested-by: Matthias Beyer --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml index ba5f57f..bcd7346 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ chrono = "0.4" clap = "3.0.0-beta.2" clap_generate = "3.0.0-beta.2" colored = "2" -config = { git = "https://github.com/matthiasbeyer/config-rs", branch = "get-value-mut" } +config = { git = "https://github.com/matthiasbeyer/config-rs", branch = "add-setter" } csv = "1.1" daggy = { version = "0.7", features = [ "serde" ] } dialoguer = "0.7" -- cgit v1.2.3