From: Daniel Axtens Date: Tue, 9 Aug 2016 04:27:36 +0000 (+1000) Subject: Fix failure to start with uninitalised database X-Git-Tag: v2.0.0-rc1~292 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=231966452f22dd344eabdd4f0722ce5463d1469a;p=thirdparty%2Fpatchwork.git Fix failure to start with uninitalised database An OptionalModelChoiceField will attempt to query the database to get choices in its __init__ method. This fails if the database hasn't been initialised yet. So, put that in a try/catch block. This lets things work through the migration and loading of data from fixtures. Signed-off-by: Daniel Axtens Reviewed-by: Andrew Donnellan Reviewed-by: Stephen Finucane --- diff --git a/patchwork/forms.py b/patchwork/forms.py index 3f876b7d..1897093c 100644 --- a/patchwork/forms.py +++ b/patchwork/forms.py @@ -21,6 +21,7 @@ from __future__ import absolute_import from django.contrib.auth.models import User from django import forms +from django.db.utils import ProgrammingError from patchwork.models import Patch, State, Bundle, UserProfile @@ -165,8 +166,14 @@ class OptionalModelChoiceField(forms.ModelChoiceField): __init__(initial=self.no_change_choice[0], *args, **kwargs) def _get_choices(self): - choices = list( - super(OptionalModelChoiceField, self)._get_choices()) + # _get_choices queries the database, which can fail if the db + # hasn't been initialised yet. catch that and give an empty + # set of choices for now. + try: + choices = list( + super(OptionalModelChoiceField, self)._get_choices()) + except ProgrammingError: + choices = [] choices.append(self.no_change_choice) return choices