tabulon/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Pull requests Activity

Merge branch 'master' into no-dot-cdist

Browse source
This commit is contained in:
Nico Schottelius 2015-03-05 11:08:49 +01:00
commit ff00df72ad
232 changed files with 4772 additions and 479 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cdist/core/cdist_type.py
View file

@ -204,11 +204,13 @@ class CdistType(object):
try:
defaults_dir = os.path.join(self.absolute_path, "parameter", "default")
for name in os.listdir(defaults_dir):
with open(os.path.join(defaults_dir, name)) as fd:
defaults[name] = fd.read().strip()
try:
with open(os.path.join(defaults_dir, name)) as fd:
defaults[name] = fd.read().strip()
except EnvironmentError:
pass # Swallow errors raised by open() or read()
except EnvironmentError:
# error ignored
pass
pass # Swallow error raised by os.listdir()
finally:
self.__parameter_defaults = defaults
return self.__parameter_defaults

2
cdist/core/manifest.py
View file

@ -144,4 +144,4 @@ class Manifest(object):
type_manifest = os.path.join(self.local.type_path, cdist_object.cdist_type.manifest_path)
message_prefix = cdist_object.name
if os.path.isfile(type_manifest):
self.local.run_script(type_manifest, env=self.env_type_manifest(cdist_object))
self.local.run_script(type_manifest, env=self.env_type_manifest(cdist_object), message_prefix=message_prefix)