summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--django/contrib/auth/management.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/django/contrib/auth/management.py b/django/contrib/auth/management.py
index c4c315eb21..1a07417f1d 100644
--- a/django/contrib/auth/management.py
+++ b/django/contrib/auth/management.py
@@ -25,11 +25,9 @@ def create_permissions(app, created_models):
for klass in app_models:
ctype = ContentType.objects.get_for_model(klass)
for codename, name in _get_all_permissions(klass._meta):
- try:
- Permission.objects.get(name=name, codename=codename, content_type__pk=ctype.id)
- except Permission.DoesNotExist:
- p = Permission(name=name, codename=codename, content_type=ctype)
- p.save()
+ p, created = Permission.objects.get_or_create(codename=codename, content_type__pk=ctype.id,
+ defaults={'name': name, 'content_type': ctype})
+ if created:
print "Adding permission '%s'" % p
def create_superuser(app, created_models):