Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/util.py @ 4388:f9cd48bd8625
Fix minor mismerge.
The caching of umask ended up being duplicated.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Sat, 28 Apr 2007 17:55:45 -0300 |
parents | e33ad7cea15f |
children | f97b89314fb3 |
comparison
equal
deleted
inserted
replaced
4387:93a4e72b4f83 | 4388:f9cd48bd8625 |
---|---|
762 return False | 762 return False |
763 return True | 763 return True |
764 except: | 764 except: |
765 return True | 765 return True |
766 | 766 |
767 _umask = os.umask(0) | |
768 os.umask(_umask) | |
769 | |
770 def checkexec(path): | 767 def checkexec(path): |
771 """ | 768 """ |
772 Check whether the given path is on a filesystem with UNIX-like exec flags | 769 Check whether the given path is on a filesystem with UNIX-like exec flags |
773 | 770 |
774 Requires a directory (like /foo/.hg) | 771 Requires a directory (like /foo/.hg) |