Ticket #6102: setup_environ.diff

__init__.py

@@ -260 +260 @@
     project_module = __import__(project_name, {}, {}, [''])
     sys.path.pop()
 
-    # Set DJANGO_SETTINGS_MODULE appropriately.
-    os.environ['DJANGO_SETTINGS_MODULE'] = '%s.%s' % (project_name,
-                                                      settings_name)
+    if not os.environ.has_key('DJANGO_SETTINGS_MODULE'):
+        # Set DJANGO_SETTINGS_MODULE appropriately, but don't enforce it
+        # if it's already defined.
+        os.environ['DJANGO_SETTINGS_MODULE'] = '%s.%s' % (project_name, settings_name)
+    
+
     return project_directory
 
 def execute_from_command_line(argv=None):