Skip to content

Commit

Permalink
Fixed #3846 -- Fixed misleading variable name in 'startapp' code. Tha…
Browse files Browse the repository at this point in the history
…nks, MarioGonzalez

git-svn-id: http://code.djangoproject.com/svn/django/trunk@4989 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information
adrianholovaty committed Apr 9, 2007
1 parent a02e13c commit 4326de3
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions django/core/management.py
Expand Up @@ -789,11 +789,12 @@ def startapp(app_name, directory):
# 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, '..'))
project_name = os.path.basename(project_dir)
if app_name == os.path.basename(directory):
parent_dir = os.path.basename(project_dir)
project_name = os.path.basename(directory)
if app_name == project_name:
sys.stderr.write(style.ERROR("Error: You cannot create an app with the same name (%r) as your project.\n" % app_name))
sys.exit(1)
_start_helper('app', app_name, directory, project_name)
_start_helper('app', app_name, directory, parent_dir)
startapp.help_doc = "Creates a Django app directory structure for the given app name in the current directory."
startapp.args = "[appname]"

Expand Down

0 comments on commit 4326de3

Please sign in to comment.