From 66f812e623cfdff380625536ed3ca7cc296535d5 Mon Sep 17 00:00:00 2001 From: Diego Torres Milano Date: Sun, 28 Apr 2013 15:02:26 -0400 Subject: [PATCH] Changed check for ADB executable on MS Windows - Version 2.3.14 --- AndroidViewClient/src/com/dtmilano/android/viewclient.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidViewClient/src/com/dtmilano/android/viewclient.py b/AndroidViewClient/src/com/dtmilano/android/viewclient.py index 78d6e09b..4febc608 100644 --- a/AndroidViewClient/src/com/dtmilano/android/viewclient.py +++ b/AndroidViewClient/src/com/dtmilano/android/viewclient.py @@ -17,7 +17,7 @@ @author: diego ''' -__version__ = '2.3.13' +__version__ = '2.3.14' import sys import subprocess @@ -1053,7 +1053,7 @@ def __obtainAdbPath(): for path in os.environ["PATH"].split(os.pathsep): exeFile = os.path.join(path, adb) - if exeFile != None and (isWindows or os.access(exeFile, os.X_OK)): + if exeFile != None and os.access(exeFile, os.X_OK if not isWindows else os.F_OK)): return exeFile raise Exception('adb="%s" is not executable. Did you forget to set ANDROID_HOME in the environment?' % adb)