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

Merge remote-tracking branch 'ungleich/master' into the-good-the-bad-and-the-ugly

Browse source
This commit is contained in:
Darko Poljak 2017-06-12 13:15:00 +02:00
commit e375bd464d
98 changed files with 1547 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cdist/core/manifest.py
View file

@ -153,7 +153,8 @@ class Manifest(object):
message_prefix = "initialmanifest"
self.local.run_script(initial_manifest,
env=self.env_initial_manifest(initial_manifest),
message_prefix=message_prefix)
message_prefix=message_prefix,
save_output=False)
def env_type_manifest(self, cdist_object):
type_manifest = os.path.join(self.local.type_path,
@ -178,4 +179,5 @@ class Manifest(object):
if os.path.isfile(type_manifest):
self.local.run_script(type_manifest,
env=self.env_type_manifest(cdist_object),
message_prefix=message_prefix)
message_prefix=message_prefix,
save_output=False)