From db13d8daefb524c4436220890da0b9089a4219cc Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Sat, 27 Mar 2021 11:35:55 +0200 Subject: refactor: use generic step to run command, instead of custom one --- obnam.md | 4 ++-- subplot/client.py | 4 ---- subplot/client.yaml | 3 --- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/obnam.md b/obnam.md index c79c952..959415d 100644 --- a/obnam.md +++ b/obnam.md @@ -1381,7 +1381,7 @@ and a Unix socket live/socket and a named pipe live/pipe and a manifest of the directory live in live.yaml when I run obnam --config smoke.yaml backup -when I invoke obnam --config smoke.yaml restore latest rest +when I run obnam --config smoke.yaml restore latest rest given a manifest of the directory live restored in rest in rest.yaml then manifests live.yaml and rest.yaml match ~~~ @@ -1484,7 +1484,7 @@ given a file live/more.dat containing some random data and a manifest of the directory live in second.yaml when I run obnam --config metadata.yaml backup -when I invoke obnam --config metadata.yaml restore latest rest +when I run obnam --config metadata.yaml restore latest rest given a manifest of the directory live restored in rest in rest.yaml then manifests second.yaml and rest.yaml match ~~~ diff --git a/subplot/client.py b/subplot/client.py index 966324e..90642f3 100644 --- a/subplot/client.py +++ b/subplot/client.py @@ -35,10 +35,6 @@ def run_obnam_restore(ctx, filename=None, genid=None, todir=None): run_obnam_restore_with_genref(ctx, filename=filename, genref=genid, todir=todir) -def run_obnam_restore_latest(ctx, filename=None, todir=None): - run_obnam_restore_with_genref(ctx, filename=filename, genref="latest", todir=todir) - - def run_obnam_restore_with_genref(ctx, filename=None, genref=None, todir=None): runcmd_run = globals()["runcmd_run"] diff --git a/subplot/client.yaml b/subplot/client.yaml index f4bf48d..eba9212 100644 --- a/subplot/client.yaml +++ b/subplot/client.yaml @@ -8,9 +8,6 @@ - when: "I invoke obnam --config {filename} restore <{genid}> {todir}" function: run_obnam_restore -- when: "I invoke obnam --config {filename} restore latest {todir}" - function: run_obnam_restore_latest - - when: "I invoke obnam --config {filename} get-chunk <{gen_id}>" function: run_obnam_get_chunk -- cgit v1.2.1