Differential D27374 Diff 80090 head/graphics/qgis/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py
Changeset View
Changeset View
Standalone View
Standalone View
head/graphics/qgis/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py
| --- python/plugins/processing/algs/saga/SagaAlgorithmProvider.py.orig 2020-03-27 05:50:09 UTC | --- python/plugins/processing/algs/saga/SagaAlgorithmProvider.py.orig 2019-12-07 13:18:21 UTC | ||||
| +++ python/plugins/processing/algs/saga/SagaAlgorithmProvider.py | +++ python/plugins/processing/algs/saga/SagaAlgorithmProvider.py | ||||
| @@ -79,7 +79,7 @@ class SagaAlgorithmProvider(QgsProcessingProvider): | @@ -79,13 +79,13 @@ class SagaAlgorithmProvider(QgsProcessingProvider): | ||||
| def canBeActivated(self): | def canBeActivated(self): | ||||
| version = SagaUtils.getInstalledVersion(True) | version = SagaUtils.getInstalledVersion(True) | ||||
| - if version is not None and (version.startswith(REQUIRED_VERSION) or version.startswith(BETA_SUPPORT_VERSION)): | - if version is not None and (version.startswith(REQUIRED_VERSION) or version.startswith(BETA_SUPPORT_VERSION)): | ||||
| + if version is not None and version >= REQUIRED_VERSION: | + if version is not None and (version.startswith(REQUIRED_VERSION) or version >= BETA_SUPPORT_VERSION): | ||||
| return True | return True | ||||
| return False | return False | ||||
| def warningMessage(self): | |||||
| version = SagaUtils.getInstalledVersion(True) | |||||
| - if version is not None and version.startswith(BETA_SUPPORT_VERSION): | |||||
| + if version is not None and version >= BETA_SUPPORT_VERSION: | |||||
| return self.tr('SAGA version {} is not officially supported - algorithms may encounter issues').format(version) | |||||
| return '' | |||||
| @@ -96,7 +96,7 @@ class SagaAlgorithmProvider(QgsProcessingProvider): | @@ -96,7 +96,7 @@ class SagaAlgorithmProvider(QgsProcessingProvider): | ||||
| self.tr('Processing'), Qgis.Critical) | self.tr('Processing'), Qgis.Critical) | ||||
| return | return | ||||
| - if not version.startswith(REQUIRED_VERSION) and not version.startswith(BETA_SUPPORT_VERSION): | - if not version.startswith(REQUIRED_VERSION) and not version.startswith(BETA_SUPPORT_VERSION): | ||||
| + if version < REQUIRED_VERSION: | + if not version.startswith(REQUIRED_VERSION) and not version >= BETA_SUPPORT_VERSION: | ||||
| QgsMessageLog.logMessage(self.tr('Problem with SAGA installation: unsupported SAGA version (found: {}, required: {}).').format(version, REQUIRED_VERSION), | QgsMessageLog.logMessage(self.tr('Problem with SAGA installation: unsupported SAGA version (found: {}, required: {}).').format(version, REQUIRED_VERSION), | ||||
| self.tr('Processing'), | self.tr('Processing'), | ||||
| Qgis.Critical) | Qgis.Critical) | ||||