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

remove obsolete method, merge code

Browse source 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
This commit is contained in:
Steven Armstrong 2011-10-13 15:11:50 +02:00
commit 6c7e280eac
1 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lib/cdist/core/code.py
View file

@ -92,20 +92,17 @@ class Code(object):
'__global': self.local.out_path, '__global': self.local.out_path,
} }
def _get_env_for_object(self, cdist_object):
return {
'__type': cdist_object.type.absolute_path,
'__object': cdist_object.absolute_path,
'__object_id': cdist_object.object_id,
'__object_fq': cdist_object.path,
}
def _run_gencode(self, cdist_object, which): def _run_gencode(self, cdist_object, which):
cdist_type = cdist_object.type cdist_type = cdist_object.type
script = os.path.join(self.local.type_path, getattr(cdist_type, 'gencode_%s_path' % which)) script = os.path.join(self.local.type_path, getattr(cdist_type, 'gencode_%s_path' % which))
env = os.environ.copy() env = os.environ.copy()
env.update(self.env) env.update(self.env)
env.update(self._get_env_for_object(cdist_object)) env.update({
'__type': cdist_object.type.absolute_path,
'__object': cdist_object.absolute_path,
'__object_id': cdist_object.object_id,
'__object_fq': cdist_object.path,
})
return self.local.run_script(script, env=env) return self.local.run_script(script, env=env)
def run_gencode_local(self, cdist_object): def run_gencode_local(self, cdist_object):