summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorNick Sandford <nick@sandford.id.au>2014-07-23 04:01:55 +0100
committerTim Graham <timograham@gmail.com>2014-07-23 08:45:09 -0400
commitfa3cf006b2912708e8c0b294cea91933cf35781f (patch)
tree0c2d051025d0583a3d5a532685faf8ca640663be /django
parent8c30df15f17c180fbfb3e378c5469c63cde6599b (diff)
Fixed #23078 -- Regression in update_contenttypes() interactivity.
Thanks raymond at adaptiv.nl for the report.
Diffstat (limited to 'django')
-rw-r--r--django/contrib/contenttypes/management.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/contrib/contenttypes/management.py b/django/contrib/contenttypes/management.py
index 0159085d0b..f705330137 100644
--- a/django/contrib/contenttypes/management.py
+++ b/django/contrib/contenttypes/management.py
@@ -60,7 +60,7 @@ def update_contenttypes(app_config, verbosity=2, interactive=True, using=DEFAULT
# Confirm that the content type is stale before deletion.
if to_remove:
- if kwargs.get('interactive', False):
+ if interactive:
content_type_display = '\n'.join(
' %s | %s' % (ct.app_label, ct.model)
for ct in to_remove