Merge lp:~patrick-hetu/charms/precise/gunicorn/fix_quotes into lp:~charmers/charms/precise/gunicorn/trunk

Proposed by Patrick Hetu
Status: Merged
Approved by: Robert Ayres
Approved revision: no longer in the source branch.
Merged at revision: 26
Proposed branch: lp:~patrick-hetu/charms/precise/gunicorn/fix_quotes
Merge into: lp:~charmers/charms/precise/gunicorn/trunk
Diff against target: 29 lines (+4/-4)
1 file modified
hooks/wsgi-file-relation-joined (+4/-4)
To merge this branch: bzr merge lp:~patrick-hetu/charms/precise/gunicorn/fix_quotes
Reviewer Review Type Date Requested Status
Robert Ayres (community) Approve
Review via email: mp+144772@code.launchpad.net

Description of the change

Minor fixes with quotes and variables

To post a comment you must log in.
Revision history for this message
Robert Ayres (robert-ayres) :
review: Approve
26. By Robert Ayres

Merge in Patrick's changes

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/wsgi-file-relation-joined'
2--- hooks/wsgi-file-relation-joined 2012-10-03 18:10:50 +0000
3+++ hooks/wsgi-file-relation-joined 2013-01-24 19:03:32 +0000
4@@ -43,8 +43,8 @@
5 fi
6
7 # If running in wsgi mode then set a default wsgi file
8-if [[ $mode -eq "wsgi" ]] && [[ $(relation-get $wsgi_wsgi_file) -eq "" ]] ; then
9- ${VAR[wsgi_wsgi_file]}="wsgi"
10+if [[ $mode -eq "wsgi" ]] && [[ $(relation-get wsgi_wsgi_file) -eq "" ]] ; then
11+ VAR[wsgi_wsgi_file]="wsgi"
12 fi
13
14 if [[ -n ${VAR[wsgi_wsgi_file]} ]] ; then
15@@ -54,7 +54,7 @@
16 if [[ -z ${VAR[python_path]} ]] ; then
17 python_path=${working_dir}
18 else
19- python_path=${VAR[python_path]}
20+ python_path="${VAR[python_path]}"
21 fi
22
23 juju-log "Writing config file: /etc/gunicorn.d/${unit_name}.conf"
24@@ -99,4 +99,4 @@
25 service gunicorn restart
26
27 juju-log "Opening port: ${VAR[port]}"
28-open-port ${VAR[port]}/tcp
29+open-port "${VAR[port]}/tcp"

Subscribers

People subscribed via source and target branches

to all changes: