merge with -stable
authorBenoit Boissinot <benoit.boissinot@ens-lyon.org>
Tue, 02 Oct 2007 20:25:35 +0200
changeset 5351 efe7ef325737
parent 5349 9189ae05467d (current diff)
parent 5350 1df76921aab3 (diff)
child 5356 b98c377b3c16
merge with -stable
mercurial/util.py
--- a/mercurial/util.py
+++ b/mercurial/util.py
@@ -1095,7 +1095,7 @@ else:
 
     def set_exec(f, mode):
         s = os.lstat(f).st_mode
-        if (s & 0100 != 0) == mode:
+        if stat.S_ISLNK(s) or (s & 0100 != 0) == mode:
             return
         if mode:
             # Turn on +x for every +r bit when making a file executable