From bc99763329b6b038fea16ec391580186f16e600a Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Tue, 16 Mar 2021 22:09:42 +0100 Subject: [PATCH] Command handling config bugfix --- src/cpl_cli/command/update_service.py | 5 ++++- src/cpl_cli/configuration/project_settings.py | 2 +- src/tests/custom/general/cpl.json | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/cpl_cli/command/update_service.py b/src/cpl_cli/command/update_service.py index 138d661c..ae7f6e64 100644 --- a/src/cpl_cli/command/update_service.py +++ b/src/cpl_cli/command/update_service.py @@ -106,7 +106,10 @@ class UpdateService(CommandABC): index = self._project_settings.dependencies.index(old_package) if '/' in new_package: new_package = new_package.split('/')[0] - + + if '\\' in new_package: + new_package = new_package.split('\\')[0] + self._project_settings.dependencies[index] = new_package config = { diff --git a/src/cpl_cli/configuration/project_settings.py b/src/cpl_cli/configuration/project_settings.py index 94a59be2..cb4dd4dd 100644 --- a/src/cpl_cli/configuration/project_settings.py +++ b/src/cpl_cli/configuration/project_settings.py @@ -110,7 +110,7 @@ class ProjectSettings(ConfigurationModelABC): if ProjectSettingsNameEnum.python_path.value in settings: path = settings[ProjectSettingsNameEnum.python_path.value] - if not os.path.isfile(path) or not os.path.islink(path): + if not os.path.isfile(path) and not os.path.islink(path): if path != '' and path is not None: Error.warn(f'{ProjectSettingsNameEnum.python_path.value} not found') diff --git a/src/tests/custom/general/cpl.json b/src/tests/custom/general/cpl.json index 0801f308..35241af0 100644 --- a/src/tests/custom/general/cpl.json +++ b/src/tests/custom/general/cpl.json @@ -16,7 +16,7 @@ "LicenseName": "MIT", "LicenseDescription": "MIT, see LICENSE for more details.", "Dependencies": [ - "sh_cpl==2021.4.1.post9" + "sh_cpl==2021.4.1.post11" ], "PythonVersion": ">=3.8", "PythonPath": "../../../../cpl-env/bin/python3.9",