[Samba] Samba git: build error when upgrading

[Gerry Reno]

Seeing a build problem after updating my git tree:

    $ git remote -v
    origin    git://git.samba.org/samba.git (fetch)
    origin    git://git.samba.org/samba.git (push)

    $ git pull
    $ ./configure ...
    $ make clean
    WAF_MAKE=1 python ./buildtools/bin/waf build
    ./buildtools/wafsamba/samba_utils.py:397: DeprecationWarning: the md5 module is deprecated; use hashlib instead
      import md5
    Waf: Entering directory `/home/gerryr/build/samba4/bin'
    symlink: samba/__init__.py -> python/samba/__init__.py
    /home/gerryr/build/samba4/wscript: error: Traceback (most recent call last):
      File "/home/gerryr/build/samba4/buildtools/wafadmin/Utils.py", line 647, in recurse
        exec(compile(txt, file_path, 'exec'), dc)
      File "/home/gerryr/build/samba4/wscript_build", line 43, in <module>
        bld.RECURSE('python')
      File "./buildtools/wafsamba/samba_utils.py", line 472, in RECURSE
        return ctx.add_subdirs(relpath)
      File "/home/gerryr/build/samba4/buildtools/wafadmin/Build.py", line 993, in add_subdirs
        self.recurse(dirs, 'build')
      File "/home/gerryr/build/samba4/buildtools/wafadmin/Utils.py", line 650, in recurse
        raise WscriptError("".join(traceback.format_exception(exc_type, exc_value, tb)), base)
    WscriptError: /home/gerryr/build/samba4/python/wscript: error: Traceback (most recent call last):
      File "/home/gerryr/build/samba4/buildtools/wafadmin/Utils.py", line 647, in recurse
        exec(compile(txt, file_path, 'exec'), dc)
      File "/home/gerryr/build/samba4/python/wscript_build", line 37, in <module>
        installdir='python')
      File "./buildtools/wafsamba/wafsamba.py", line 685, in SAMBA_SCRIPT
        os.symlink(link_src, link_dst)
    OSError: [Errno 17] File exists


Are there some files I should remove before upgrading my tree from 4.0.4 to current?