From e8408d39fd492873f6f64312148ab8a7270050b4 Mon Sep 17 00:00:00 2001 From: Al Date: Mon, 12 Sep 2016 16:42:02 -0400 Subject: [PATCH] [fix] unzip_file checks status code --- scripts/geodata/file_utils.py | 2 +- scripts/geodata/openaddresses/download_openaddresses.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/geodata/file_utils.py b/scripts/geodata/file_utils.py index a0a39a08..28cd53e1 100644 --- a/scripts/geodata/file_utils.py +++ b/scripts/geodata/file_utils.py @@ -13,7 +13,7 @@ def download_file(url, dest, retries=3, retry_delay=5): def unzip_file(filename, dest): ensure_dir(dest) - subprocess.call(['unzip', '-o', filename, '-d', dest]) + return subprocess.check_call(['unzip', '-o', filename, '-d', dest]) == 0 def remove_file(filename): diff --git a/scripts/geodata/openaddresses/download_openaddresses.py b/scripts/geodata/openaddresses/download_openaddresses.py index 24ca5851..bc5d083a 100644 --- a/scripts/geodata/openaddresses/download_openaddresses.py +++ b/scripts/geodata/openaddresses/download_openaddresses.py @@ -14,7 +14,7 @@ sys.path.append(os.path.realpath(os.path.join(os.pardir, os.pardir))) from geodata.openaddresses.config import openaddresses_config from geodata.csv_utils import unicode_csv_reader -from geodata.file_utils import ensure_dir, download_file, cd, remove_file +from geodata.file_utils import ensure_dir, download_file, unzip_file, cd, remove_file from geodata.encoding import safe_encode, safe_decode BASE_OPENADDRESSES_DATA_URL = 'http://results.openaddresses.io' @@ -29,7 +29,7 @@ def download_and_unzip_file(url, out_dir): zip_filename = url.rsplit('/', 1)[-1].strip() zip_local_path = os.path.join(out_dir, zip_filename) - success = download_file(url, zip_local_path) and subprocess.check_call(['unzip', '-o', zip_local_path, '-d', out_dir]) == 0 + success = download_file(url, zip_local_path) and unzip_file(zip_local_path, out_dir) if os.path.exists(zip_local_path): remove_file(zip_local_path)