innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Prevent people from using "startapp" to create apps with the same name as their project. Might stop some of the accidents. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@2946 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2006-05-19 07:40:06 +00:00
parent d5c9e19403
commit 816b65f260
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/core/management.py
View File

@ -665,6 +665,9 @@ def startapp(app_name, directory):
# the parent directory. # the parent directory.
project_dir = os.path.normpath(os.path.join(directory, '..')) project_dir = os.path.normpath(os.path.join(directory, '..'))
project_name = os.path.basename(project_dir) project_name = os.path.basename(project_dir)
if app_name == os.path.basename(directory):
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, project_name)
startapp.help_doc = "Creates a Django app directory structure for the given app name in the current directory." startapp.help_doc = "Creates a Django app directory structure for the given app name in the current directory."
startapp.args = "[appname]" startapp.args = "[appname]"