From 6b937a8db32d691bd2d1b40fdd90a29bc9c3b1c7 Mon Sep 17 00:00:00 2001 From: Adam Palay Date: Mon, 25 Jan 2016 12:45:50 -0500 Subject: [PATCH] Revert "Merge pull request #11311 from edx/jsa/fail-safe-reverse" This reverts commit 0d1765e190d4e51929e9806f32b931f6d3fd455c, reversing changes made to d2eaa63353089fcadb6ddb0504f482fe64d21c3b. --- .../migrations/0002_data__add_service_user.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 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 02c1a53388..12d72d271b 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,16 +1,12 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -import logging -from django.db import migrations +from django.db import migrations, models 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) @@ -24,9 +20,8 @@ def remove_service_user(apps, schema_editor): """Remove service user.""" try: User.objects.get(username=settings.CREDENTIALS_SERVICE_USERNAME).delete() - 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.') + except User.DoesNotExist: + return class Migration(migrations.Migration):