# HG changeset patch # User Marcin Kuzminski # Date 2017-12-18 23:18:28 # Node ID 20bf9c614bfa5607cc2340636040fb0ee2456c15 # Parent 8e6e54fdff2b817a6ea13c230179fed5a858768a integrations: skip executing EE integrations activated from EE but not present in downgrade at CE. diff --git a/rhodecode/model/integration.py b/rhodecode/model/integration.py --- a/rhodecode/model/integration.py +++ b/rhodecode/model/integration.py @@ -30,6 +30,7 @@ from sqlalchemy import or_, and_ import rhodecode from rhodecode import events +from rhodecode.integrations.types.base import EEIntegration from rhodecode.lib.caching_query import FromCache from rhodecode.model import BaseModel from rhodecode.model.db import Integration, Repository, RepoGroup @@ -89,6 +90,11 @@ class IntegrationModel(BaseModel): log.error('No class could be found for integration type: {}'.format( integration.integration_type)) return None + elif isinstance(TypeClass, EEIntegration) or issubclass(TypeClass, EEIntegration): + log.error('EE integration cannot be ' + 'executed for integration type: {}'.format( + integration.integration_type)) + return None return TypeClass(integration.settings)