From d7f4707044ea8976927f06496846ecdc2551db84 Mon Sep 17 00:00:00 2001 From: Wayne Witzel III Date: Fri, 3 Nov 2017 08:53:53 -0400 Subject: [PATCH] Handle programming error when evaluating the replaces list for 320 --- awx/main/migrations/0006_v320_release.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/awx/main/migrations/0006_v320_release.py b/awx/main/migrations/0006_v320_release.py index 173e649c77..c0a4330e04 100644 --- a/awx/main/migrations/0006_v320_release.py +++ b/awx/main/migrations/0006_v320_release.py @@ -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 []