Merge branch 'master' of git.iggdrasil.net:/srv/git/ishtar

Conflicts:
	archaeological_operations/templates/ishtar/sheet_operation.html

1 files changed, 8 insertions, 7 deletions

diff --git a/ishtar_common/management/commands/regenerate_permissions.py b/ishtar_common/management/commands/regenerate_permissions.py
index c2af8b353..599e64d64 100644
--- a/ishtar_common/management/commands/regenerate_permissions.py
+++ b/ishtar_common/management/commands/regenerate_permissions.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Copyright (C) 2013 Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
+# Copyright (C) 2013-2017 Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
@@ -17,14 +17,13 @@
 
 # See the file COPYING for details.
 
-import sys
 
-from django.db import models
-from django.core.management.base import BaseCommand, CommandError
+from django.core.management.base import BaseCommand
 from django.contrib.contenttypes.models import ContentType
 
 from django.contrib.auth.models import Permission
 
+
 class Command(BaseCommand):
     args = ''
     help = 'Regenerate permissions'
@@ -35,6 +34,8 @@ class Command(BaseCommand):
             if not model:
                 continue
             for perm_slug, perm_label in model._meta.permissions:
-                Permission.objects.get_or_create(content_type=ct,
-                                    codename=perm_slug,
-                                    defaults={'name':perm_label})
+                perm, c = Permission.objects.get_or_create(
+                    content_type=ct, codename=perm_slug,
+                    defaults={'name': perm_label})
+                if c:
+                    print('Permission {} created.'.format(perm_label))