Ticket #8245: Misleading-AlreadyRegistered-02.diff

django/contrib/admin/__init__.py

@@ -2 +2 @@
 from django.contrib.admin.options import StackedInline, TabularInline
 from django.contrib.admin.sites import AdminSite, site
 
+valid_apps_admin = []
+
 def autodiscover():
     """
     Auto-discover INSTALLED_APPS admin.py modules and fail silently when 
@@ -10 +12 @@
     """
     import imp
     from django.conf import settings
+
     for app in settings.INSTALLED_APPS:
-        try:
-            imp.find_module("admin", __import__(app, {}, {}, [app.split(".")[-1]]).__path__)
-        except ImportError:
-            # there is no app admin.py, skip it
-            continue
-        __import__("%s.admin" % app)
+
+        if app not in valid_apps_admin:
+
+            try:
+                imp.find_module("admin", __import__(app, {}, {}, [app.split(".")[-1]]).__path__)
+            except ImportError:
+                # there is no app admin.py, skip it
+                continue
+            try:
+                __import__("%s.admin" % app)
+            except:
+                raise
+            else:
+                valid_apps_admin.append(app)