--- a/mercurial/util.py Mon Dec 24 17:21:40 2007 +0100
+++ b/mercurial/util.py Tue Dec 25 14:30:10 2007 +0100
@@ -1132,6 +1132,17 @@
"""check whether a file is executable"""
return (os.lstat(f).st_mode & 0100 != 0)
+ def force_chmod(f, s):
+ try:
+ os.chmod(f, s)
+ except OSError, inst:
+ if inst.errno != errno.EPERM:
+ raise
+ # maybe we don't own the file, try copying it
+ new_f = mktempcopy(f)
+ os.chmod(new_f, s)
+ os.rename(new_f, f)
+
def set_exec(f, mode):
s = os.lstat(f).st_mode
if stat.S_ISLNK(s) or (s & 0100 != 0) == mode:
@@ -1139,9 +1150,9 @@
if mode:
# Turn on +x for every +r bit when making a file executable
# and obey umask.
- os.chmod(f, s | (s & 0444) >> 2 & ~_umask)
+ force_chmod(f, s | (s & 0444) >> 2 & ~_umask)
else:
- os.chmod(f, s & 0666)
+ force_chmod(f, s & 0666)
def set_link(f, mode):
"""make a file a symbolic link/regular file