From f65c5b9ce353df8ffa158f2f3c461918883d4379 Mon Sep 17 00:00:00 2001 From: jsa Date: Fri, 22 Jan 2016 14:55:51 -0500 Subject: [PATCH] =?UTF-8?q?ensure=20reverse=20migration=20to=20delete=20a?= =?UTF-8?q?=20specific=20row=20won=E2=80=99t=20fail.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migrations/0002_data__add_service_user.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/openedx/core/djangoapps/credentials/migrations/0002_data__add_service_user.py b/openedx/core/djangoapps/credentials/migrations/0002_data__add_service_user.py index 12d72d271b..02c1a53388 100644 --- a/openedx/core/djangoapps/credentials/migrations/0002_data__add_service_user.py +++ b/openedx/core/djangoapps/credentials/migrations/0002_data__add_service_user.py @@ -1,12 +1,16 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals +import logging -from django.db import migrations, models +from django.db import migrations from django.conf import settings from django.contrib.auth.models import User +logger = logging.getLogger(__name__) + + def add_service_user(apps, schema_editor): """Add service user.""" user, created = User.objects.get_or_create(username=settings.CREDENTIALS_SERVICE_USERNAME) @@ -20,8 +24,9 @@ def remove_service_user(apps, schema_editor): """Remove service user.""" try: User.objects.get(username=settings.CREDENTIALS_SERVICE_USERNAME).delete() - except User.DoesNotExist: - return + except Exception: # pylint: disable=broad-except + logger.exception('Unexpected error while attempting to delete credentials service user.') + logger.warning('This service user account may need cleanup, but migrations can safely continue.') class Migration(migrations.Migration):