rouxdo/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'issue/249' of git://github.com/asteven/cdist into preos

Browse source
This commit is contained in:
Nico Schottelius 2014-01-09 09:29:38 +01:00
commit 8d167c4ab7
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
cdist/exec/remote.py
View file

@ -23,6 +23,7 @@
import io import io
import os import os
import sys import sys
import glob
import subprocess import subprocess
import logging import logging
@ -94,9 +95,17 @@ class Remote(object):
"""Transfer a file or directory to the remote side.""" """Transfer a file or directory to the remote side."""
self.log.debug("Remote transfer: %s -> %s", source, destination) self.log.debug("Remote transfer: %s -> %s", source, destination)
self.rmdir(destination) self.rmdir(destination)
command = self._copy.split() if os.path.isdir(source):
command.extend(["-r", source, self.target_host + ":" + destination]) self.mkdir(destination)
self._run_command(command) for f in glob.glob1(source, '*'):
command = self._copy.split()
path = os.path.join(source, f)
command.extend([path, '{0}:{1}'.format(self.target_host, destination)])
self._run_command(command)
else:
command = self._copy.split()
command.extend([source, '{0}:{1}'.format(self.target_host, destination)])
self._run_command(command)
def run_script(self, script, env=None, return_output=False): def run_script(self, script, env=None, return_output=False):
"""Run the given script with the given environment on the remote side. """Run the given script with the given environment on the remote side.