Ticket #8329: startproj.diff

django/core/management/base.py

@@ -169 +169 @@
     def handle_label(self, label, **options):
         raise NotImplementedError()
 
+class InvalidStartProjectContextCommand(BaseCommand):
+    args = ''
+
+    def handle(self, *args, **options):
+        #if args:
+        raise CommandError("The startproject command has been disabled as you have a project defined. Hint unset your DJANGO_SETTINGS_MODULE environment variable")
+        #return self.handle_noargs(**options)
+
+    def handle_noargs(self, **options):
+        raise CommandError("The startproject command has been disabled as you have a project defined. Hint unset your DJANGO_SETTINGS_MODULE environment variable")
+        #raise NotImplementedError()
+
+
 class NoArgsCommand(BaseCommand):
     args = ''
 

django/core/management/__init__.py

@@ -4 +4 @@
 from imp import find_module
 
 import django
-from django.core.management.base import BaseCommand, CommandError, handle_default_options
+from django.core.management.base import BaseCommand, CommandError, handle_default_options, InvalidStartProjectContextCommand
 
 # For backwards compatibility: get_version() used to be in this module.
 get_version = django.get_version
@@ -125 +125 @@
         if project_directory:
             # Remove the "startproject" command from self.commands, because
             # that's a django-admin.py command, not a manage.py command.
-            del _commands['startproject']
+            #del _commands['startproject']
+            _commands['startproject'] = InvalidStartProjectContextCommand()
 
             # Override the startapp command so that it always uses the
             # project_directory, not the current working directory