summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2016-01-16 19:19:56 +0200
committerLars Wirzenius <liw@liw.fi>2016-01-16 23:24:25 +0200
commit3601570b89e74304924744a001e2fe2ee28dd17b (patch)
tree5e7c7781919d85c2a952d23834350d626079a024
parente505738f6b9cc75a70a7766bd13b4f98cf56adcb (diff)
downloadobnam-benchmarks-3601570b89e74304924744a001e2fe2ee28dd17b.tar.gz
Delete the restore target directory
This avoids "obnam restore" from failing if it's been already used once in the benchmark.
-rw-r--r--NEWS8
-rw-r--r--obbenchlib/benchmarker.py1
2 files changed, 9 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index cd71b47..d1420a9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,14 @@
NEWS file for obbench
=====================
+Version 0.7, released UNRELEASED
+--------------------------------
+
+* Fix the `restore part` **again**. This time it was breaking because
+ the temporary directory to which restores happen gets reused, and
+ the second time it fails, 'cause it needs to be empty, 'cause I said
+ so.
+
Version 0.6, released 2016-01-01
--------------------------------
diff --git a/obbenchlib/benchmarker.py b/obbenchlib/benchmarker.py
index f8223a6..f843449 100644
--- a/obbenchlib/benchmarker.py
+++ b/obbenchlib/benchmarker.py
@@ -157,6 +157,7 @@ class Benchmarker(object):
self.run_obnam(['backup'])
def run_obnam_restore(self):
+ cliapp.runcmd(['find', self._restored, '-delete'])
self.run_obnam(['restore', '--to', self._restored])
def run_obnam(self, args):