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

update environment with messages environment

Browse source 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
This commit is contained in:
Nico Schottelius 2013-12-03 14:36:38 +01:00
commit 90896a9e06
2 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
cdist/exec/local.py
View file

@ -168,6 +168,7 @@ class Local(object):
if message_prefix: if message_prefix:
message = cdist.message.Message(message_prefix, self.messages_path) message = cdist.message.Message(message_prefix, self.messages_path)
env.update(message.env)
try: try:
if return_output: if return_output:

2
cdist/message.py
View file

@ -56,12 +56,14 @@ class Message(object):
shutil.copyfile(self.global_messages, self.messages_in) shutil.copyfile(self.global_messages, self.messages_in)
def _cleanup(self): def _cleanup(self):
"""remove temporary files"""
if os.path.exists(self.messages_in): if os.path.exists(self.messages_in):
os.remove(self.messages_in) os.remove(self.messages_in)
if os.path.exists(self.messages_out): if os.path.exists(self.messages_out):
os.remove(self.messages_out) os.remove(self.messages_out)
def _merge_messages(self): def _merge_messages(self):
"""merge newly written lines into global file"""
with open(self.messages_out) as fd: with open(self.messages_out) as fd:
content = fd.readlines() content = fd.readlines()