Permalink
Browse files

Fixed #5824 -- For the `startapp` command, pass the true project nam…

…e to the `copy_helper` function instead of the name of the project's parent directory.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@6621 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
gdub committed Oct 27, 2007
1 parent 2dfad61 commit 62c574e765f149f6152c3092e1c6e511e24cb465
Showing with 4 additions and 5 deletions.
  1. +4 −5 django/core/management/commands/startapp.py
@@ -14,14 +14,13 @@ class Command(LabelCommand):
def handle_label(self, app_name, directory=None, **options):
if directory is None:
directory = os.getcwd()
- # Determine the project_name a bit naively -- by looking at the name of
- # the parent directory.
- project_dir = os.path.normpath(os.path.join(directory, os.pardir))
- parent_dir = os.path.basename(project_dir)
+ # Determine the project_name by using the basename of directory,
+ # which should be the full path of the project directory (or the
+ # current directory if no directory was passed).
project_name = os.path.basename(directory)
if app_name == project_name:
raise CommandError("You cannot create an app with the same name (%r) as your project." % app_name)
- copy_helper(self.style, 'app', app_name, directory, parent_dir)
+ copy_helper(self.style, 'app', app_name, directory, project_name)
class ProjectCommand(Command):
help = "Creates a Django app directory structure for the given app name in this project's directory."

0 comments on commit 62c574e

Please sign in to comment.