mirror of
https://github.com/ansible/awx.git
synced 2024-11-02 01:21:21 +03:00
Merge pull request #569 from wwitzel3/release_3.2.2
Handle programming error when evaluating the replaces list for 320
This commit is contained in:
commit
1b44ca8ef4
@ -10,7 +10,8 @@ from django.db import (
|
||||
connection,
|
||||
migrations,
|
||||
models,
|
||||
OperationalError
|
||||
OperationalError,
|
||||
ProgrammingError
|
||||
)
|
||||
from django.conf import settings
|
||||
import taggit.managers
|
||||
@ -26,7 +27,7 @@ def replaces():
|
||||
recorder = migrations.recorder.MigrationRecorder(connection)
|
||||
result = recorder.migration_qs.filter(app='main').filter(name__in=squashed).all()
|
||||
return [('main', m.name) for m in result]
|
||||
except OperationalError:
|
||||
except (OperationalError, ProgrammingError):
|
||||
return []
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user