Permalink
Browse files

allow settings file outside of project (settings does not prepend the…

… project name automatically anymore)
  • Loading branch information...
stefanfoulis committed Feb 10, 2010
1 parent d674f6b commit f133d2346d2f8e9a7ade17a6add20eb8681937a6
Showing with 6 additions and 7 deletions.
  1. +6 −7 src/djangoprojectrecipe/recipe.py
@@ -147,7 +147,7 @@ def __init__(self, buildout, name, options):
options.setdefault('src-dir', '')
options.setdefault('project', 'project')
- options.setdefault('settings', 'development')
+ options.setdefault('settings', '%s.development' % options['project'])
options.setdefault('urlconf', options['project'] + '.urls')
options.setdefault(
@@ -295,8 +295,7 @@ def create_manage_script(self, extra_paths, ws):
'djangoprojectrecipe.manage', 'main')],
ws, self.options['executable'], self.options['bin-directory'],
extra_paths = extra_paths,
- arguments= "'%s.%s'" % (project,
- self.options['settings']))
+ arguments= "'%s'" % (self.options['settings']))
@@ -310,8 +309,7 @@ def create_test_runner(self, extra_paths, working_set):
working_set, self.options['executable'],
self.options['bin-directory'],
extra_paths = extra_paths,
- arguments= "'%s.%s', %s" % (
- self.options['project'],
+ arguments= "'%s', %s" % (
self.options['settings'],
', '.join(["'%s'" % app for app in apps])))
else:
@@ -351,6 +349,7 @@ def create_project(self, project_dir):
open(os.path.join(project_dir, '__init__.py'), 'w').close()
def make_scripts(self, extra_paths, ws):
+ print "superbuildoutrecipe making scripts :-) "
scripts = []
_script_template = zc.buildout.easy_install.script_template
for protocol in ('wsgi', 'fcgi'):
@@ -370,8 +369,8 @@ def make_scripts(self, extra_paths, ws):
self.options['executable'],
self.options['bin-directory'],
extra_paths=extra_paths,
- arguments= "'%s.%s', logfile='%s'" % (
- project, self.options['settings'],
+ arguments= "'%s', logfile='%s'" % (
+ self.options['settings'],
self.options.get('logfile'))))
zc.buildout.easy_install.script_template = _script_template
return scripts

0 comments on commit f133d23

Please sign in to comment.