From 9029c496b09381f451b66648f7722ad35a43ddf8 Mon Sep 17 00:00:00 2001 From: Scott McKay Date: Thu, 16 May 2019 02:38:38 +1000 Subject: [PATCH] Currently download_test_data in build.py supports only the standalone version of 7-Zip by looking for 7za.exe. Add support for the standard version which has 7z.exe. (#1030) --- tools/ci_build/build.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/ci_build/build.py b/tools/ci_build/build.py index ab8223e7b1..ee3130c9c4 100755 --- a/tools/ci_build/build.py +++ b/tools/ci_build/build.py @@ -270,8 +270,10 @@ def download_test_data(build_dir, src_url, expected_md5, azure_sas_key): shutil.rmtree(models_dir) if shutil.which('unzip'): run_subprocess(['unzip','-qd', models_dir, local_zip_file]) - elif shutil.which('7za'): - run_subprocess(['7za','x', local_zip_file, '-y', '-o' + models_dir]) + elif shutil.which('7z'): # 7-Zip + run_subprocess(['7z','x', local_zip_file, '-y', '-o' + models_dir]) + elif shutil.which('7za'): # 7-Zip standalone + run_subprocess(['7za', 'x', local_zip_file, '-y', '-o' + models_dir]) else: #TODO: use python for unzip log.error("No unzip tool for use")