From 8d471067a813c27d3254234bb992f196b7eeefca Mon Sep 17 00:00:00 2001
From: Marco Mariani <marco.mariani@nexedi.com>
Date: Wed, 24 Oct 2012 11:55:14 +0200
Subject: [PATCH] use createWrapper() for rdiff-backup
---
slapos/recipe/pbs.py | 24 +++++++++++-------------
1 file changed, 11 insertions(+), 13 deletions(-)
diff --git a/slapos/recipe/pbs.py b/slapos/recipe/pbs.py
index 22c524b89..48ba0b96c 100644
--- a/slapos/recipe/pbs.py
+++ b/slapos/recipe/pbs.py
@@ -134,8 +134,7 @@ class Recipe(GenericSlapRecipe, Notify, Callback):
'host': parsed_url.hostname,
}
- command = [self.options['rdiffbackup-binary']]
- command.extend(['--remote-schema', remote_schema])
+ parameters = ['--remote-schema', remote_schema]
remote_directory = '%(port)s::%(path)s' % {'port': parsed_url.port,
'path': parsed_url.path}
@@ -144,24 +143,23 @@ class Recipe(GenericSlapRecipe, Notify, Callback):
name_hash)
if entry['type'] == 'push':
- command.extend(['--restore-as-of', 'now'])
- command.append('--force')
- command.extend([local_directory, remote_directory])
+ parameters.extend(['--restore-as-of', 'now'])
+ parameters.append('--force')
+ parameters.extend([local_directory, remote_directory])
else:
- command.extend([remote_directory, local_directory])
+ parameters.extend([remote_directory, local_directory])
wrapper_basepath = os.path.join(self.options['wrappers-directory'],
url_hash)
- wrapper_path = wrapper_basepath
if 'notify' in entry:
- wrapper_path = '%s_raw' % wrapper_basepath
+ wrapper_path = wrapper_basepath + '_raw'
+ else:
+ wrapper_path = wrapper_basepath
- wrapper = self.createPythonScript(
- wrapper_path,
- 'slapos.recipe.librecipe.execute.execute',
- [str(i) for i in command]
- )
+ wrapper = self.createWrapper(name=wrapper_path,
+ command=self.options['rdiffbackup-binary'],
+ parameters=parameters)
path_list.append(wrapper)
if 'notify' in entry:
--
2.30.9