pull umask-checking up
authorMatt Mackall <mpm@selenic.com>
Fri, 29 Dec 2006 20:04:30 -0600
changeset 4326 5e3936eabe5d
parent 4324 cd650cd61b06
child 4327 aba90193f4e4
pull umask-checking up
mercurial/util.py
--- a/mercurial/util.py	Thu Mar 29 10:25:19 2007 -0500
+++ b/mercurial/util.py	Fri Dec 29 20:04:30 2006 -0600
@@ -851,6 +851,8 @@
 
 else:
     nulldev = '/dev/null'
+    _umask = os.umask(0)
+    os.umask(_umask)
 
     def rcfiles(path):
         rcs = [os.path.join(path, 'hgrc')]
@@ -892,9 +894,7 @@
         if mode:
             # Turn on +x for every +r bit when making a file executable
             # and obey umask.
-            umask = os.umask(0)
-            os.umask(umask)
-            os.chmod(f, s | (s & 0444) >> 2 & ~umask)
+            os.chmod(f, s | (s & 0444) >> 2 & ~_umask)
         else:
             os.chmod(f, s & 0666)