summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2021-03-27 11:35:55 +0200
committerLars Wirzenius <liw@liw.fi>2021-03-27 11:35:55 +0200
commitdb13d8daefb524c4436220890da0b9089a4219cc (patch)
treea6adc34a7d46e25b0b273b1db8c7fe6bc8e99720
parent177fee25ca7ab25e0c951344d1cce2f09b6f7372 (diff)
downloadobnam2-db13d8daefb524c4436220890da0b9089a4219cc.tar.gz
refactor: use generic step to run command, instead of custom one
-rw-r--r--obnam.md4
-rw-r--r--subplot/client.py4
-rw-r--r--subplot/client.yaml3
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