From 56089af0e8c5732caaa777ee0691d9ae7a557d31 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aleksander=20=C5=81ukasz?= Date: Tue, 14 Jan 2014 12:35:40 +0100 Subject: [PATCH 1/1] fix gunicorn sample upload failing when optional setting 'django_root_path' is not set --- fnpdjango/deploy/__init__.py | 8 +++++--- setup.py | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/fnpdjango/deploy/__init__.py b/fnpdjango/deploy/__init__.py index 7c20cd4..eaf5e71 100644 --- a/fnpdjango/deploy/__init__.py +++ b/fnpdjango/deploy/__init__.py @@ -136,7 +136,7 @@ class DebianGunicorn(Service): sudo('gunicorn-debian restart %s' % self.name, shell=False) def upload_sample(self): - upload_sample('gunicorn') + upload_sample('gunicorn', additional_context = dict(django_root_path = get_django_root_path(env['release']))) class Apache(Service): def run(self): @@ -173,7 +173,7 @@ def upload_samples(): for service in env.services: service.upload_sample() -def upload_sample(name, where="samples/"): +def upload_sample(name, where="samples/", additional_context=None): require('app_path', 'project_name') upload_path = '%s/%s%s.sample' % (env['app_path'], where, name) if files.exists(upload_path): @@ -182,7 +182,9 @@ def upload_sample(name, where="samples/"): template = '%(project_name)s/' % env + name + '.template' if not exists(template): template = join(dirname(abspath(__file__)), 'templates/' + name + '.template') - files.upload_template(template, upload_path, env) + template_context = additional_context or dict() + template_context.update(env) + files.upload_template(template, upload_path, template_context) def upload_localsettings_sample(): "Fill out localsettings template and upload as a sample." diff --git a/setup.py b/setup.py index 2a1d81e..db7ff1a 100755 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ def whole_trees(package_dir, paths): setup( name='fnpdjango', - version='0.1.13', + version='0.1.14', author='Radek Czajka', author_email='radekczajka@nowoczesnapolska.org.pl', url = '', -- 2.20.1