From 1c3902f3db6dc05240c7ef1c84d825e9e7a3822c Mon Sep 17 00:00:00 2001 From: Steven Armstrong Date: Thu, 13 Oct 2011 15:09:47 +0200 Subject: [PATCH] implement run_code_remote Signed-off-by: Steven Armstrong --- lib/cdist/core/code.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/lib/cdist/core/code.py b/lib/cdist/core/code.py index 22a8ad34..b2cc033c 100644 --- a/lib/cdist/core/code.py +++ b/lib/cdist/core/code.py @@ -116,13 +116,22 @@ class Code(object): """Run the gencode-remote script for the given cdist object.""" return self._run_gencode(cdist_object, 'remote') - def run_code_local(self, cdist_object): - script = os.path.join(self.local.object_path, cdist_object.code_local_path) - return self.local.run_script(script) - def transfer_code_remote(self, cdist_object): """Transfer the code_remote script for the given object to the remote side.""" source = os.path.join(self.local.object_path, cdist_object.code_remote_path) destination = os.path.join(self.remote.object_path, cdist_object.code_remote_path) self.remote.mkdir(destination) self.remote.transfer(source, destination) + + def _run_code(self, cdist_object, which): + which_exec = getattr(self, which) + script = os.path.join(self.local.object_path, getattr(cdist_object, 'code_%s_path' % which)) + return which_exec.run_script(script) + + def run_code_local(self, cdist_object): + """Run the code-local script for the given cdist object.""" + return self._run_code(cdist_object, 'local') + + def run_code_remote(self, cdist_object): + """Run the code-remote script for the given cdist object on the remote side.""" + return self._run_code(cdist_object, 'remote')