support rsync for remote copy

13 years ago · 3e6b866cae
parent 53ca7e7aca
commit 3e6b866cae
1 changed files with 6 additions and 1 deletions
--- a/lib/cdist/exec/remote.py
+++ b/lib/cdist/exec/remote.py
@ -77,7 +77,12 @@ class Remote(object):
        self.log.debug("Remote transfer: %s -> %s", source, destination)
        self.rmdir(destination)
        command = self._copy.split()
-        command.extend(["-r", source, self.target_host + ":" + destination])
+        # support rsync by appending a "/" to the source if it's a directory
+        if os.path.isdir(source) == True:
+           command.extend(["-r", source + "/", self.target_host + ":" + destination])
+        else:
+           command.extend(["-r", source, self.target_host + ":" + destination])
+
        self._run_command(command)

    def run_script(self, script, env=None, return_output=False):