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

allow passing arguments to Popen()

Browse source 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-09-08 09:47:30 +02:00
commit e8360df96b
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
bin/cdist
View file

@ -59,22 +59,22 @@ class Cdist:
sys.exit(1) sys.exit(1)
def run_or_fail(self,*args): def run_or_fail(self,*args, **kargs):
# newargs = ["echo"] # newargs = ["echo"]
newargs = [] newargs = []
newargs.extend(*args) newargs.extend(*args)
print(newargs) print(newargs)
try: try:
subprocess.check_call(newargs) subprocess.check_call(newargs, **kargs)
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
self.exit_error("Command failed:", " ".join(newargs)) self.exit_error("Command failed:", " ".join(newargs))
def remote_run_or_fail(self, *args): def remote_run_or_fail(self, *args, **kargs):
"""Run something on the remote side and fail is something breaks""" """Run something on the remote side and fail is something breaks"""
newargs = ["ssh", "root@" + self.hostname] newargs = ["ssh", "root@" + self.hostname]
newargs.extend(*args) newargs.extend(*args)
self.run_or_fail(newargs) self.run_or_fail(newargs, **kargs)
def remove_remote_dir(self, destination): def remove_remote_dir(self, destination):
self.remote_run_or_fail(["rm", "-rf", destination]) self.remote_run_or_fail(["rm", "-rf", destination])