External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-13 17:24:45 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #570 from wwitzel3/release_3.2.2

Browse Source 
Handle ProgrammingError in squashed helpers
This commit is contained in:
Wayne Witzel III
2017-11-03 10:45:09 -04:00
committed by GitHub
parent 1b44ca8ef4 1a5b5c32b8
commit 7149c41804
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/main/migrations/_squashed.py
View File

@@ -3,6 +3,7 @@ from django.db import (
connection, connection,
migrations, migrations,
OperationalError, OperationalError,
ProgrammingError,
) )
@@ -30,7 +31,7 @@ def current_migration(exclude_squashed=True):
if exclude_squashed: if exclude_squashed:
migration_qs = migration_qs.exclude(name__contains='squashed') migration_qs = migration_qs.exclude(name__contains='squashed')
return migration_qs.latest('id') return migration_qs.latest('id')
except (recorder.Migration.DoesNotExist, OperationalError): except (recorder.Migration.DoesNotExist, OperationalError, ProgrammingError):
return None return None