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

string, not tuple in exception

Browse source 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-10-06 20:05:24 +02:00
commit 14082f5c00
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/cdist/config_install.py
View file

@ -65,7 +65,7 @@ class ConfigInstall:
log.info("Running global explorers") log.info("Running global explorers")
explorers = self.path.list_global_explorers() explorers = self.path.list_global_explorers()
if(len(explorers) == 0): if(len(explorers) == 0):
raise cdist.Error("No explorers found in", self.path.global_explorer_dir) raise cdist.Error("No explorers found in " + self.path.global_explorer_dir)
self.path.transfer_global_explorers() self.path.transfer_global_explorers()
for explorer in explorers: for explorer in explorers:
@ -251,12 +251,13 @@ class ConfigInstall:
self.target_host, self.target_host,
duration.total_seconds()) duration.total_seconds())
### Cleaned / check functions: Round 1 :-) #################################
def deploy_and_cleanup(self): def deploy_and_cleanup(self):
"""Do what is most often done: deploy & cleanup""" """Do what is most often done: deploy & cleanup"""
self.deploy_to() self.deploy_to()
self.cleanup() self.cleanup()
### Cleaned / check functions: Round 1 :-) #################################
def init_deploy(self): def init_deploy(self):
"""Ensure the base directories are cleaned up""" """Ensure the base directories are cleaned up"""
log.debug("Creating clean directory structure") log.debug("Creating clean directory structure")