From a9c465cf8c916a68dda2e964b772a5f0d04bf945 Mon Sep 17 00:00:00 2001 From: Anders Ingemann Date: Sun, 15 Sep 2013 18:53:03 +0200 Subject: [PATCH] Minor fixes to paths --- common/tasks/loopback.py | 2 +- plugins/prebootstrapped/tasks.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/tasks/loopback.py b/common/tasks/loopback.py index c453d6a..315fc5a 100644 --- a/common/tasks/loopback.py +++ b/common/tasks/loopback.py @@ -21,7 +21,7 @@ class MoveImage(Task): def run(self, info): import os.path filename = 'loopback-{id:x}.{ext}'.format(id=info.run_id, ext=info.volume.extension) - destination = os.path.join(info.bootstrapper['workspace'], filename) + destination = os.path.join(info.manifest.bootstrapper['workspace'], filename) import shutil shutil.move(info.volume.image_path, destination) import logging diff --git a/plugins/prebootstrapped/tasks.py b/plugins/prebootstrapped/tasks.py index f4eb1fa..3899336 100644 --- a/plugins/prebootstrapped/tasks.py +++ b/plugins/prebootstrapped/tasks.py @@ -50,7 +50,7 @@ class CopyImage(Task): def run(self, info): import os.path from shutil import copyfile - loopback_backup_name = 'loopback-{id:x}.img.backup'.format(id=info.run_id) + loopback_backup_name = 'volume-{id:x}.{ext}.backup'.format(id=info.run_id, ext=info.volume.extension) destination = os.path.join(info.manifest.bootstrapper['workspace'], loopback_backup_name) copyfile(info.volume.image_path, destination) msg = 'A copy of the bootstrapped volume was created. Path: {path}'.format(path=destination)