matthijs/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Issues Pull requests Projects Releases Wiki Activity

mark _run_command as private

Browse source 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
This commit is contained in:
Steven Armstrong 2011-11-18 14:40:25 +01:00
parent 31403722ce
commit 654e19f28b
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
conf/type/__file/gencode-local
View file

@ -31,8 +31,6 @@ if [ -f "$__object/parameter/source" ]; then
remote_cksum="$(cat "$__object/explorer/cksum")" remote_cksum="$(cat "$__object/explorer/cksum")"
if [ "$local_cksum" != "$remote_cksum" ]; then if [ "$local_cksum" != "$remote_cksum" ]; then
# Export target_host so remote_copy script has access to it
echo "export __target_host=\"$__target_host\""
echo "$__remote_copy" "$source" "${__target_host}:${destination}" echo "$__remote_copy" "$source" "${__target_host}:${destination}"
fi fi
else else

6
lib/cdist/exec/remote.py
View file

@ -91,7 +91,7 @@ class Remote(object):
self.rmdir(destination) self.rmdir(destination)
command = self._copy.split() command = self._copy.split()
command.extend(["-r", source, self.target_host + ":" + destination]) command.extend(["-r", source, self.target_host + ":" + destination])
self.run_command(command) self._run_command(command)
def run(self, command, env=None, return_output=False): def run(self, command, env=None, return_output=False):
"""Run the given command with the given environment on the remote side. """Run the given command with the given environment on the remote side.
@ -102,9 +102,9 @@ class Remote(object):
cmd = self._exec.split() cmd = self._exec.split()
cmd.append(self.target_host) cmd.append(self.target_host)
cmd.extend(command) cmd.extend(command)
return self.run_command(cmd, env=env, return_output=return_output) return self._run_command(cmd, env=env, return_output=return_output)
def run_command(self, command, env=None, return_output=False): def _run_command(self, command, env=None, return_output=False):
"""Run the given command with the given environment. """Run the given command with the given environment.
Return the output as a string. Return the output as a string.