External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 01:17:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #569 from wwitzel3/release_3.2.2

Browse Source 
Handle programming error when evaluating the replaces list for 320
This commit is contained in:
Wayne Witzel III
2017-11-03 09:02:58 -04:00
committed by GitHub
parent ce393da6fd d7f4707044
commit 1b44ca8ef4
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/main/migrations/0006_v320_release.py
View File

@@ -10,7 +10,8 @@ from django.db import (
connection, connection,
migrations, migrations,
models, models,
OperationalError OperationalError,
ProgrammingError
) )
from django.conf import settings from django.conf import settings
import taggit.managers import taggit.managers
@@ -26,7 +27,7 @@ def replaces():
recorder = migrations.recorder.MigrationRecorder(connection) recorder = migrations.recorder.MigrationRecorder(connection)
result = recorder.migration_qs.filter(app='main').filter(name__in=squashed).all() result = recorder.migration_qs.filter(app='main').filter(name__in=squashed).all()
return [('main', m.name) for m in result] return [('main', m.name) for m in result]
except OperationalError: except (OperationalError, ProgrammingError):
return [] return []