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

Merge branch 'install' into split_into_modules

Browse source
This commit is contained in:
Nico Schottelius 2011-09-23 18:33:59 +02:00
commit edfc54505b
1 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
bin/cdist
View file

@ -81,9 +81,9 @@ def file_to_list(filename):
return lines return lines
def exit_error(*args): class CdistError(Exception):
log.error(*args) """Base exception class for this project"""
sys.exit(1) pass
class Cdist: class Cdist:
"""Cdist main class to hold arbitrary data""" """Cdist main class to hold arbitrary data"""
@ -153,7 +153,7 @@ class Cdist:
def remote_mkdir(self, directory): def remote_mkdir(self, directory):
"""Create directory on remote side""" """Create directory on remote side"""
self.nun_or_fail(["mkdir", "-p", directory], remote=True) self.run_or_fail(["mkdir", "-p", directory], remote=True)
def remote_cat(filename): def remote_cat(filename):
"""Use cat on the remote side for output""" """Use cat on the remote side for output"""
@ -181,13 +181,16 @@ class Cdist:
if remote: if remote:
remote_cat(script) remote_cat(script)
else: else:
script_fd = open(script) try:
print(script_fd.read()) script_fd = open(script)
script_fd.close() print(script_fd.read())
script_fd.close()
except IOError as error:
raise CdistError(str(error))
exit_error("Command failed (shell): " + " ".join(*args)) raise CdistError("Command failed (shell): " + " ".join(*args))
except OSError as error: except OSError as error:
exit_error(" ".join(*args) + ": " + error.args[1]) raise CdistError(" ".join(*args) + ": " + error.args[1])
def run_or_fail(self, *args, **kargs): def run_or_fail(self, *args, **kargs):
if "remote" in kargs: if "remote" in kargs:
@ -200,9 +203,9 @@ class Cdist:
try: try:
subprocess.check_call(*args, **kargs) subprocess.check_call(*args, **kargs)
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
exit_error("Command failed: " + " ".join(*args)) raise CdistError("Command failed: " + " ".join(*args))
except OSError as error: except OSError as error:
exit_error(" ".join(*args) + ": " + error.args[1]) raise CdistError(" ".join(*args) + ": " + error.args[1])
def remove_remote_dir(self, destination): def remove_remote_dir(self, destination):
@ -368,7 +371,7 @@ class Cdist:
"""Run global explorers""" """Run global explorers"""
explorers = self.list_global_explorers() explorers = self.list_global_explorers()
if(len(explorers) == 0): if(len(explorers) == 0):
exit_error("No explorers found in", self.global_explorer_dir) raise CdistError("No explorers found in", self.global_explorer_dir)
self.transfer_global_explorers() self.transfer_global_explorers()
for explorer in explorers: for explorer in explorers:
@ -674,7 +677,7 @@ def emulator():
try: try:
os.makedirs(param_out_dir, exist_ok=True) os.makedirs(param_out_dir, exist_ok=True)
except OSError as error: except OSError as error:
exit_error(param_out_dir + ": " + error.args[1]) raise CdistError(param_out_dir + ": " + error.args[1])
# Record parameter # Record parameter
params = vars(args) params = vars(args)
@ -789,4 +792,7 @@ if __name__ == "__main__":
else: else:
commandline() commandline()
except KeyboardInterrupt: except KeyboardInterrupt:
sys.exit(0) sys.exit(0)
except CdistError as e:
log.error(e)
sys.exit(1)