waf refuse to build if samba already installed

[Matthieu Patou]

Hello Thomas & all,

I was trying to upgrade a samba that is installed in /usr/local/samba
so in /usr/local/src/samba I git update + configure + waf -v and got
Waf: Leaving directory `/usr/local/src/samba/bin'
Build failed:  -> task failed (err #-1):
     {task: cc replace.c -> replace_2.o}
   File "./buildtools/bin/waf", line 76, in <module>
     Scripting.prepare(t, cwd, VERSION, wafdir)
   File "/usr/local/src/samba/buildtools/wafadmin/Scripting.py", line 
147, in prepare
     error(str(e))


Which is pretty useless, it seems that
"Build failed:  -> task failed (err #-1):
     {task: cc replace.c -> replace_2.o}" is the result of error(str(e))

I changed the script to reexectue the command that leads to the 
exception and got:

   File "./buildtools/bin/waf", line 76, in <module>
     Scripting.prepare(t, cwd, VERSION, wafdir)
   File "/usr/local/src/samba/buildtools/wafadmin/Scripting.py", line 
148, in prepare
     prepare_impl(t, cwd, ver, wafdir)
   File "/usr/local/src/samba/buildtools/wafadmin/Scripting.py", line 
127, in prepare_impl
     opt_obj.sub_options([''])
   File "/usr/local/src/samba/buildtools/wafadmin/Options.py", line 262, 
in sub_options
     self.recurse(k[0], name='set_options')
   File "/usr/local/src/samba/buildtools/wafadmin/Utils.py", line 634, 
in recurse
     f(self)
   File "/usr/local/src/samba/wscript", line 35, in set_options
     opt.BUILTIN_DEFAULT('NONE')
   File "./buildtools/wafsamba/samba_bundled.py", line 41, in 
BUILTIN_DEFAULT
     if 'BUILTIN_LIBRARIES_DEFAULT' in Options.options:
TypeError: argument of type 'instance' is not iterable

Any though on :
1) make the error of waf a bit more helpful
2) avoid the problem for the type error ?

Matthieu.

-- 
Matthieu Patou
Samba Team
http://samba.org