From e10ebeadf89f31bb1b6a85c45e7eb65b1c6aba0a Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Sat, 8 Oct 2011 03:24:05 +0200 Subject: [PATCH] BUGFIX: export global explorer with path from remote Signed-off-by: Nico Schottelius --- lib/cdist/config_install.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/cdist/config_install.py b/lib/cdist/config_install.py index 3e67f7c1..3544a901 100644 --- a/lib/cdist/config_install.py +++ b/lib/cdist/config_install.py @@ -24,6 +24,7 @@ import logging import os import stat import sys +import time import cdist.context import cdist.core @@ -230,7 +231,7 @@ class ConfigInstall: output_fd = open(os.path.join(dst_path, explorer), mode='w') cmd = [] cmd.append("__explorer=" + remote_dst_path) - cmd.append(os.path.join(src_path, explorer)) + cmd.append(os.path.join(remote_dst_path, explorer)) cdist.exec.run_or_fail(cmd, stdout=output_fd, remote_prefix=True) output_fd.close() @@ -252,8 +253,11 @@ class ConfigInstall: def deploy_and_cleanup(self): """Do what is most often done: deploy & cleanup""" + start_time = time.time() self.deploy_to() self.cleanup() + log.info("Finished run of %s in %s seconds", + self.target_host, time.time() - start_time) def stage_prepare(self): """Do everything for a deploy, minus the actual code stage"""