Index: hooks/utils.py |
=== modified file 'hooks/utils.py' |
--- hooks/utils.py 2013-11-14 19:10:28 +0000 |
+++ hooks/utils.py 2013-11-15 14:56:04 +0000 |
@@ -557,7 +557,7 @@ |
def write_builtin_server_startup( |
gui_root, ssl_cert_path, serve_tests=False, sandbox=False, |
- builtin_server_logging='info', insecure=False): |
+ builtin_server_logging='info', insecure=False, charmworld_url=''): |
"""Generate the builtin server Upstart file.""" |
log('Generating the builtin server Upstart file.') |
context = { |
@@ -567,6 +567,7 @@ |
'sandbox': sandbox, |
'serve_tests': serve_tests, |
'ssl_cert_path': ssl_cert_path, |
+ 'charmworld_url': charmworld_url, |
} |
if not sandbox: |
is_legacy_juju = legacy_juju() |
@@ -586,11 +587,12 @@ |
def start_builtin_server( |
build_dir, ssl_cert_path, serve_tests, sandbox, builtin_server_logging, |
- insecure): |
+ insecure, charmworld_url): |
"""Start the builtin server.""" |
write_builtin_server_startup( |
build_dir, ssl_cert_path, serve_tests=serve_tests, sandbox=sandbox, |
- builtin_server_logging=builtin_server_logging, insecure=insecure) |
+ builtin_server_logging=builtin_server_logging, insecure=insecure, |
+ charmworld_url=charmworld_url) |
log('Starting the builtin server.') |
with su('root'): |
service_control(BUILTIN_SERVER, RESTART) |