Ticket #15915: 15915_patch.diff

Index: django/contrib/auth/tests/permissions.py
===================================================================
--- django/contrib/auth/tests/permissions.py    (revision 16342)
+++ django/contrib/auth/tests/permissions.py    (working copy)
@@ -6,16 +6,21 @@
 from django.contrib.auth.management import create_permissions
 from django.contrib.auth import models as auth_models
 from django.contrib.contenttypes import models as contenttypes_models
-from django.core.management import call_command
+from django.core.management import call_command, CommandError
 from django.test import TestCase
 
 
 class TestAuthPermissions(TestCase):
+
+    def setUp(self):
+        self._original_user_permissions = auth_models.User._meta.permissions
+
     def tearDown(self):
         # These tests mess with content types, but content type lookups
         # are cached, so we need to make sure the effects of this test
         # are cleaned up.
         contenttypes_models.ContentType.objects.clear_cache()
+        auth_models.User._meta.permissions = self._original_user_permissions
 
     def test_permission_register_order(self):
         """Test that the order of registered permissions doesn't break"""
@@ -33,6 +38,34 @@
         call_command('loaddata', 'test_permissions.json',
                      verbosity=0, commit=False, stderr=stderr)
         self.assertEqual(stderr.getvalue(), '')
+
+    def test_permission_duplicates_checking(self):
+        """Test that we show proper error message if we are trying to
+        create duplicate permissions.
+        """
+        auth_models.User._meta.permissions = [
+           ('change_user', 'Can edit user (duplicate)')]
+        self.assertRaisesRegexp(CommandError,
+            'The permission codename change_user clashes with a builtin '
+            'for model auth.User.',
+            create_permissions, auth_models, [], verbosity=0)
+
+        auth_models.User._meta.permissions = [
+            ('my_custom_permission', 'Some permission'),
+            ('other_one', 'Some other permission'),
+            ('my_custom_permission', 'Some permission with duplicate code'),
+        ]
+        self.assertRaisesRegexp(CommandError,
+            'The permission codename is duplicated for model auth.User: '
+            'my_custom_permission',
+            create_permissions, auth_models, [], verbosity=0)
+
+        # should not raise anything
+        auth_models.User._meta.permissions = [
+            ('my_custom_permission', 'Some permission'),
+            ('other_one', 'Some other permission'),
+        ]
+        create_permissions(auth_models, [], verbosity=0)
Index: django/contrib/auth/management/__init__.py
===================================================================
--- django/contrib/auth/management/__init__.py  (revision 16342)
+++ django/contrib/auth/management/__init__.py  (working copy)
@@ -7,23 +7,52 @@
 from django.contrib.auth import models as auth_app
 from django.db.models import get_models, signals
 from django.contrib.auth.models import User
+from django.core.management.base import CommandError
 
 
+def _check_permissions_clashing(custom, builtin, ctype):
+    "Raises CommandError if there are duplicate permissions."
+    pool = set()
+    builtin_codenames = set(p[0] for p in builtin)
+    for codename, _name in custom:
+        if codename in pool:
+            raise CommandError(
+                "The permission codename is duplicated for model %s.%s: %s" %
+                (ctype.app_label, ctype.model_class().__name__, codename))
+        elif codename in builtin_codenames:
+            raise CommandError(
+                "The permission codename %s clashes with a builtin for model "
+                "%s.%s." %
+                (codename, ctype.app_label, ctype.model_class().__name__))
+        pool.add(codename)
+
+
 def _get_permission_codename(action, opts):
     return u'%s_%s' % (action, opts.object_name.lower())
 
 
-def _get_all_permissions(opts):
-    "Returns (codename, name) for all permissions in the given opts."
+def _get_builtin_permissions(opts):
+    "Returns (codename, name) for all autogenerated permissions."
     perms = []
     for action in ('add', 'change', 'delete'):
-        perms.append((_get_permission_codename(action, opts), u'Can %s %s' % (action, opts.verbose_name_raw)))
-    return perms + list(opts.permissions)
+        perms.append(
+            (_get_permission_codename(action, opts),
+             u'Can %s %s' % (action, opts.verbose_name_raw)))
+    return perms
 
 
+def _get_all_permissions(opts, ctype):
+    "Returns (codename, name) for all permissions in the given opts."
+    builtin = _get_builtin_permissions(opts)
+    custom = list(opts.permissions)
+    _check_permissions_clashing(custom, builtin, ctype)
+    return builtin + custom
+
+
 def create_permissions(app, created_models, verbosity, **kwargs):
     from django.contrib.contenttypes.models import ContentType
 
@@ -34,7 +63,7 @@
     for klass in app_models:
         ctype = ContentType.objects.get_for_model(klass)
         ctypes.add(ctype)
-        for perm in _get_all_permissions(klass._meta):
+        for perm in _get_all_permissions(klass._meta, ctype):
             searched_perms.append((ctype, perm))
 
     # Find all the Permissions that have a context_type for a model we're