From 3601570b89e74304924744a001e2fe2ee28dd17b Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Sat, 16 Jan 2016 19:19:56 +0200 Subject: Delete the restore target directory This avoids "obnam restore" from failing if it's been already used once in the benchmark. --- NEWS | 8 ++++++++ obbenchlib/benchmarker.py | 1 + 2 files changed, 9 insertions(+) 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): -- cgit v1.2.1