From ce118572a943d991c0f700d9e3cdfbadc2e357c1 Mon Sep 17 00:00:00 2001 From: Ted Chambers Date: Thu, 13 Aug 2020 11:06:05 -0400 Subject: [PATCH 1/2] fix for issue #354 --- azure-devops/azure/devops/_file_cache.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/azure-devops/azure/devops/_file_cache.py b/azure-devops/azure/devops/_file_cache.py index 55da484c..555574b6 100644 --- a/azure-devops/azure/devops/_file_cache.py +++ b/azure-devops/azure/devops/_file_cache.py @@ -114,7 +114,11 @@ def get_cache_dir(): azure_devops_cache_dir = os.getenv('AZURE_DEVOPS_CACHE_DIR', None)\ or os.path.expanduser(os.path.join('~', '.azure-devops', 'python-sdk', 'cache')) if not os.path.exists(azure_devops_cache_dir): - os.makedirs(azure_devops_cache_dir) + try: + os.makedirs(azure_devops_cache_dir) + except FileExistsError: + # https://github.com/microsoft/azure-devops-python-api/issues/354 + pass return azure_devops_cache_dir From f543437bfa46aac1da1cd77f08c19245fd626f9f Mon Sep 17 00:00:00 2001 From: Ted Chambers Date: Thu, 13 Aug 2020 11:28:05 -0400 Subject: [PATCH 2/2] catch OSError instead of FileExistsError, since FileExistsError is not available in python 2.7 --- azure-devops/azure/devops/_file_cache.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/azure-devops/azure/devops/_file_cache.py b/azure-devops/azure/devops/_file_cache.py index 555574b6..2415ebab 100644 --- a/azure-devops/azure/devops/_file_cache.py +++ b/azure-devops/azure/devops/_file_cache.py @@ -116,9 +116,11 @@ def get_cache_dir(): if not os.path.exists(azure_devops_cache_dir): try: os.makedirs(azure_devops_cache_dir) - except FileExistsError: + except OSError: # https://github.com/microsoft/azure-devops-python-api/issues/354 - pass + # FileExistsError is not available in python 2.7 + if not os.path.exists(azure_devops_cache_dir): + raise return azure_devops_cache_dir