Mercurial > hg

changeset 15499:58f96703a9ab stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
posix: fix findexe() to check for file type and access
author Marc-Antoine Ruel <maruel@google.com>
date Wed, 16 Nov 2011 17:55:32 -0600
parents ac5a340b26de
children ae04af1ce78d
files mercurial/posix.py
diffstat 1 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/posix.py	Tue Nov 15 02:16:30 2011 +0100
+++ b/mercurial/posix.py	Wed Nov 16 17:55:32 2011 -0600
@@ -258,7 +258,7 @@
 
     def findexisting(executable):
         'Will return executable if existing file'
-        if os.path.exists(executable):
+        if os.path.isfile(executable) and os.access(executable, os.X_OK):
             return executable
         return None
 
@@ -268,9 +268,7 @@
     for path in os.environ.get('PATH', '').split(os.pathsep):
         executable = findexisting(os.path.join(path, command))
         if executable is not None:
-            st = os.stat(executable)
-            if (st.st_mode & (stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH)):
-                return executable
+            return executable
     return None
 
 def setsignalhandler():