From 7f6db37774dd41dec591f0a54eb99ba35d833419 Mon Sep 17 00:00:00 2001 From: antonio Date: Sat, 15 Jun 2013 18:39:51 +0100 Subject: fix missing file test (transplanted from 19a5828d1523a8308cf652d18eb1824e85d1c304) --- src/engine/SCons/Tool/MSCommon/vc.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/engine/SCons/Tool/MSCommon/vc.py b/src/engine/SCons/Tool/MSCommon/vc.py index 818475c..c970118 100644 --- a/src/engine/SCons/Tool/MSCommon/vc.py +++ b/src/engine/SCons/Tool/MSCommon/vc.py @@ -259,15 +259,15 @@ def find_batch_file(env,msvc_version,host_arch,target_arch): installed_sdks=get_installed_sdks() for _sdk in installed_sdks: sdk_bat_file = _sdk.get_sdk_vc_script(host_arch,target_arch) - if sdk_bat_file and os.path.join(pdir,sdk_bat_file): + if not sdk_bat_file: + debug("vc.py:find_batch_file() not found:%s"%_sdk) + else: sdk_bat_file_path = os.path.join(pdir,sdk_bat_file) - debug('vc.py:find_batch_file() sdk_bat_file_path:%s'%sdk_bat_file_path) + if os.path.exists(sdk_bat_file_path): + debug('vc.py:find_batch_file() sdk_bat_file_path:%s'%sdk_bat_file_path) + return (batfilename,sdk_bat_file_path) + return (batfilename,None) - return (batfilename,sdk_bat_file_path) - else: - debug("vc.py:find_batch_file() not found:%s"%_sdk) - else: - return (batfilename,None) __INSTALLED_VCS_RUN = None -- cgit v0.12