From af0ab58512338785078f38a03dd0f1ee786fc8b2 Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: Oct 04 2017 14:45:36 +0000 Subject: Replace Query.one_or_none() with Query.first(), because python-sqlalchemy in EPEL7 does not support that. --- diff --git a/freshmaker/handlers/brew/container_task_state_change.py b/freshmaker/handlers/brew/container_task_state_change.py index 4eae46e..8a0a546 100644 --- a/freshmaker/handlers/brew/container_task_state_change.py +++ b/freshmaker/handlers/brew/container_task_state_change.py @@ -45,7 +45,7 @@ class BrewContainerTaskStateChangeHandler(ContainerBuildHandler): # check db to see whether this build exists in db found_build = db.session.query(ArtifactBuild).filter_by(type=ArtifactType.IMAGE.value, - build_id=build_id).one_or_none() + build_id=build_id).first() if found_build is not None: # update build state in db if event.new_state == 'CLOSED': diff --git a/freshmaker/handlers/errata/errata_advisory_state_changed.py b/freshmaker/handlers/errata/errata_advisory_state_changed.py index 4d2baab..880dad0 100644 --- a/freshmaker/handlers/errata/errata_advisory_state_changed.py +++ b/freshmaker/handlers/errata/errata_advisory_state_changed.py @@ -51,7 +51,7 @@ class ErrataAdvisoryStateChangedHandler(BaseHandler): # check db to see whether this advisory exists in db db_event = db.session.query(Event).filter_by( event_type_id=EVENT_TYPES[ErrataAdvisoryRPMsSignedEvent], - search_key=str(errata_id)).one_or_none() + search_key=str(errata_id)).first() if not db_event: log.debug("Ignoring Errata advisory %d - it does not exist in " "Freshmaker db.", errata_id) @@ -72,7 +72,7 @@ class ErrataAdvisoryStateChangedHandler(BaseHandler): db_event = db.session.query(Event).filter_by( event_type_id=EVENT_TYPES[ErrataAdvisoryRPMsSignedEvent], - search_key=str(errata_id)).one_or_none() + search_key=str(errata_id)).first() if db_event: log.debug("Ignoring Errata advisory %d - it already exists in " "Freshmaker db.", errata_id)