summaryrefslogtreecommitdiff
path: root/subplot
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2020-12-23 09:44:31 +0200
committerLars Wirzenius <liw@liw.fi>2020-12-23 10:17:17 +0200
commit15ce048ca21ad517e27ab598d861ae07f817067d (patch)
tree01857ffa023c770164a9cc07d1024ed388150864 /subplot
parentd6584921d8bb77fd4de8b6997848599cb9d73e01 (diff)
downloadobnam2-15ce048ca21ad517e27ab598d861ae07f817067d.tar.gz
feat! add a global --config option
This breaks all invocations of the Obnam client, as the option needs to come before the subcommand name. The benefit of this breakage is simpler, less repetitive code.
Diffstat (limited to 'subplot')
-rw-r--r--subplot/client.py12
-rw-r--r--subplot/client.yaml2
2 files changed, 12 insertions, 2 deletions
diff --git a/subplot/client.py b/subplot/client.py
index d89b7d4..1dcbe8c 100644
--- a/subplot/client.py
+++ b/subplot/client.py
@@ -28,7 +28,17 @@ def run_obnam_restore(ctx, filename=None, genid=None, todir=None):
genid = ctx["vars"][genid]
runcmd_run(
- ctx, ["env", "RUST_LOG=obnam", "obnam", "restore", filename, genid, todir]
+ ctx,
+ [
+ "env",
+ "RUST_LOG=obnam",
+ "obnam",
+ "--config",
+ filename,
+ "restore",
+ genid,
+ todir,
+ ],
)
diff --git a/subplot/client.yaml b/subplot/client.yaml
index 63033c3..f8e89b6 100644
--- a/subplot/client.yaml
+++ b/subplot/client.yaml
@@ -4,7 +4,7 @@
- given: "a client config based on {filename}"
function: configure_client
-- when: "I invoke obnam restore {filename} <{genid}> {todir}"
+- when: "I invoke obnam --config {filename} restore <{genid}> {todir}"
function: run_obnam_restore
- then: "backup generation is {varname}"