sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-11-26 04:23:49 +03:00
Code Activity

build: cope with existing binaries in bin/ left over from the old build

Browse Source
This commit is contained in:
Andrew Tridgell
2010-04-13 09:33:18 +10:00
parent b1a27e81d7
commit 9c6781277a
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
buildtools/wafsamba/samba_install.py
View File

@@ -133,8 +133,7 @@ def symlink_lib(self):
link_target = os.path.join(blddir, link_target) link_target = os.path.join(blddir, link_target)
if os.path.lexists(link_target): if os.path.lexists(link_target):
old_link = os.readlink(link_target) if os.path.islink(link_target) and os.readlink(link_target) == libpath:
if libpath == old_link:
return return
os.unlink(link_target) os.unlink(link_target)
os.symlink(libpath, link_target) os.symlink(libpath, link_target)
@@ -153,8 +152,7 @@ def symlink_bin(self):
bldpath = os.path.join(self.bld.env.BUILD_DIRECTORY, self.link_task.outputs[0].name) bldpath = os.path.join(self.bld.env.BUILD_DIRECTORY, self.link_task.outputs[0].name)
if os.path.lexists(bldpath): if os.path.lexists(bldpath):
old_link = os.readlink(bldpath) if os.path.islink(bldpath) and os.readlink(bldpath) == binpath:
if binpath == old_link:
return return
os.unlink(bldpath) os.unlink(bldpath)
os.symlink(binpath, bldpath) os.symlink(binpath, bldpath)