diff options
author | Quentin Dufour <quentin@deuxfleurs.fr> | 2022-08-10 12:18:44 +0200 |
---|---|---|
committer | Quentin Dufour <quentin@deuxfleurs.fr> | 2022-08-11 10:21:45 +0200 |
commit | 2c7bae935ac68acab831fe86e5330d3c9a84a953 (patch) | |
tree | 8a63f9fcc8e476ec81ee60cbdbfb3069eb2e7f36 /src/garage/main.rs | |
parent | 8cd02639dc688dcb736b5c36dae822706862fac1 (diff) | |
download | garage-2c7bae935ac68acab831fe86e5330d3c9a84a953.tar.gz garage-2c7bae935ac68acab831fe86e5330d3c9a84a953.zip |
Configure structopt to report the right versionv0.7.2_ci-test-2bug/reported-version
By default, structopt reports the value provided by
the env var CARGO_PKG_VERSION, feeded by Cargo when reading
Cargo.toml. However for Garage we use a versioning based on git,
so we often report a version that is behind the real version.
In this commit, we create garage_util::version::garage() that
reports the right version and configure all structopt subcommands
to call this function instead of using the env var.
Diffstat (limited to 'src/garage/main.rs')
-rw-r--r-- | src/garage/main.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/garage/main.rs b/src/garage/main.rs index 3fa5c3c0..89888884 100644 --- a/src/garage/main.rs +++ b/src/garage/main.rs @@ -22,6 +22,7 @@ use garage_util::error::*; use garage_rpc::system::*; use garage_rpc::*; +use garage_util::version; use garage_model::helper::error::Error as HelperError; @@ -29,7 +30,7 @@ use admin::*; use cli::*; #[derive(StructOpt, Debug)] -#[structopt(name = "garage")] +#[structopt(name = "garage", version = version::garage(), about = "S3-compatible object store for self-hosted geo-distributed deployments")] struct Opt { /// Host to connect to for admin operations, in the format: /// <public-key>@<ip>:<port> |