fancsali/cdist-backup
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Handle init manifest error nicely.

Browse source
This commit is contained in:
Darko Poljak 2017-09-18 23:04:01 +02:00 • committed by Darko Poljak
commit 0f1fa4c041
2 changed files with 45 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cdist/core/manifest.py
View file

@ -158,11 +158,15 @@ class Manifest(object):
stdout_path = os.path.join(self.local.stdout_base_path, which)
with open(stderr_path, 'ba+') as stderr, \
open(stdout_path, 'ba+') as stdout:
self.local.run_script(
initial_manifest,
env=self.env_initial_manifest(initial_manifest),
message_prefix=message_prefix,
stdout=stdout, stderr=stderr)
try:
self.local.run_script(
initial_manifest,
env=self.env_initial_manifest(initial_manifest),
message_prefix=message_prefix,
stdout=stdout, stderr=stderr)
except cdist.Error as e:
raise cdist.InitialManifestError(initial_manifest, stdout_path,
stderr_path, e)
def env_type_manifest(self, cdist_object):
type_manifest = os.path.join(self.local.type_path,