From f9c28eedafb8dc6525ef4f61534b2cde6f5b15fa Mon Sep 17 00:00:00 2001 From: Oliver Date: Wed, 15 Jun 2022 18:52:10 +1000 Subject: [PATCH] Add error handling for case where user does not have git installed (#3179) (#3198) (cherry picked from commit 5ecba6b13c9ce062052b263addeaed503e309abd) --- InvenTree/plugin/helpers.py | 6 ++++++ InvenTree/plugin/registry.py | 3 +++ 2 files changed, 9 insertions(+) diff --git a/InvenTree/plugin/helpers.py b/InvenTree/plugin/helpers.py index 8a3a38a4ca..5eff52b66c 100644 --- a/InvenTree/plugin/helpers.py +++ b/InvenTree/plugin/helpers.py @@ -114,6 +114,9 @@ def get_git_log(path): output = output.split('\n') except subprocess.CalledProcessError: # pragma: no cover pass + except FileNotFoundError: # pragma: no cover + # Most likely the system does not have 'git' installed + pass if not output: output = 7 * [''] # pragma: no cover @@ -129,6 +132,9 @@ def check_git_version(): output = str(subprocess.check_output(['git', '--version'], cwd=os.path.dirname(settings.BASE_DIR)), 'utf-8') except subprocess.CalledProcessError: # pragma: no cover return False + except FileNotFoundError: # pragma: no cover + # Most likely the system does not have 'git' installed + return False # process version string try: diff --git a/InvenTree/plugin/registry.py b/InvenTree/plugin/registry.py index 40e5bd3ff5..07c723cb37 100644 --- a/InvenTree/plugin/registry.py +++ b/InvenTree/plugin/registry.py @@ -231,6 +231,9 @@ class PluginsRegistry: except subprocess.CalledProcessError as error: # pragma: no cover logger.error(f'Ran into error while trying to install plugins!\n{str(error)}') return False + except FileNotFoundError: # pragma: no cover + # System most likely does not have 'git' installed + return False logger.info(f'plugin requirements were run\n{output}')