sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-26 10:04:02 +03:00
Code

wafsamba: fix dependency for SAMBA_GENERATOR() when passing vars!=None

Browse Source 
vars can only be a dictionary as that's the only thing bld.EXPAND_VARIABLES()
accepts.

We need to checksum the whole vars dictionary into the dependencies.

We set task.env.SAMBA_GENERATOR_VARS = vars and add SAMBA_GENERATOR_VARS
to the dep_vars.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
This commit is contained in:
Stefan Metzmacher 2014-08-26 23:11:39 +02:00
parent ee8fbbd417
commit da8c763545
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
buildtools/wafsamba/wafsamba.py
View File

@ -599,11 +599,8 @@ def SAMBA_GENERATOR(bld, name, rule, source='', target='',
return
dep_vars = []
if isinstance(vars, dict):
dep_vars = vars.keys()
elif isinstance(vars, list):
dep_vars = vars
dep_vars.append('ruledeps')
dep_vars.append('SAMBA_GENERATOR_VARS')
bld.SET_BUILD_GROUP(group)
t = bld(
@ -618,6 +615,10 @@ def SAMBA_GENERATOR(bld, name, rule, source='', target='',
dep_vars = dep_vars,
name=name)
if vars is None:
vars = {}
t.env.SAMBA_GENERATOR_VARS = vars
if always:
t.always = True