make more use of run_or_fail

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
remotes/origin/feature_files_export
Nico Schottelius 13 years ago
parent 14ac0e3ad1
commit 99268591c2
  1. 11
      bin/cdist

@ -139,18 +139,13 @@ class Cdist:
log.error(*args) log.error(*args)
sys.exit(1) sys.exit(1)
def remote_mkdir(directory): def remote_mkdir(self, directory):
"""Create directory on remote side""" """Create directory on remote side"""
self.run_or_fail(["mkdir", "-p", directory], remote=True) self.run_or_fail(["mkdir", "-p", directory], remote=True)
def remote_cat(filename): def remote_cat(filename):
cmd = self.remote_prefix """Use cat on the remote side for output"""
cmd.append("cat") self.run_or_fail(["cat", filename], remote=True)
cmd.append(filename)
try:
subprocess.call(cmd)
except subprocess.CalledProcessError:
log.error("Remote cat failed")
def shell_run_or_debug_fail(self, script, *args, **kargs): def shell_run_or_debug_fail(self, script, *args, **kargs):
# Manually execute /bin/sh, because sh -e does what we want # Manually execute /bin/sh, because sh -e does what we want

Loading…
Cancel
Save