[SCM] Samba Shared Repository - branch master updated

[Andrew Tridgell]

The branch, master has been updated
       via  9c67812... build: cope with existing binaries in bin/ left over from the old build
      from  b1a27e8... s3: Apply some const

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 9c6781277a9ebf5e0a9d65ece14b95335d596af6
Author: Andrew Tridgell <tridge at samba.org>
Date:   Tue Apr 13 09:33:18 2010 +1000

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

-----------------------------------------------------------------------

Summary of changes:
 buildtools/wafsamba/samba_install.py |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/samba_install.py b/buildtools/wafsamba/samba_install.py
index 6da4493..28bd270 100644
--- a/buildtools/wafsamba/samba_install.py
+++ b/buildtools/wafsamba/samba_install.py
@@ -133,8 +133,7 @@ def symlink_lib(self):
     link_target = os.path.join(blddir, link_target)
 
     if os.path.lexists(link_target):
-        old_link = os.readlink(link_target)
-        if libpath == old_link:
+        if os.path.islink(link_target) and os.readlink(link_target) == libpath:
             return
         os.unlink(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)
 
     if os.path.lexists(bldpath):
-        old_link = os.readlink(bldpath)
-        if binpath == old_link:
+        if os.path.islink(bldpath) and os.readlink(bldpath) == binpath:
             return
         os.unlink(bldpath)
     os.symlink(binpath, bldpath)


-- 
Samba Shared Repository