Merge lp:~joetalbott/charms/trusty/snappy-proposed-image-builder/fix_logging into lp:~canonical-ci-engineering/charms/trusty/snappy-proposed-image-builder/trunk

[Joe Talbott]

fix hookenv.log usage.

fix hookenv.log usage.

[Thomi Richards (thomir-deactivatedaccount)]

review: Approve

=== modified file 'hooks/actions.py'
--- hooks/actions.py	2015-06-04 15:29:02 +0000
+++ hooks/actions.py	2015-06-04 21:37:57 +0000
@@ -32,7 +32,7 @@
 
 
 def log_start(service_name):
-    hookenv.log('%s starting', SERVICE_NAME)
+    hookenv.log('%s starting' % SERVICE_NAME)
 
 
 def install_packages(service_name):
@@ -58,7 +58,7 @@
 
 def update_config_file(service_name):
     hookenv.log(
-        'Updating service configuration file: %s', SERVICE_CONFIGNAME)
+        'Updating service configuration file: %s' % SERVICE_CONFIGNAME)
     config_content = base64.b64decode(config['config-file'])
     config_path = os.path.join(_service_dir(), SERVICE_CONFIGNAME)
     with open(config_path, 'w') as f:
@@ -67,7 +67,7 @@
 
 def create_user(service_name):
     username = 'core-worker'
-    hookenv.log('Creating service user: %s', username)
+    hookenv.log('Creating service user: %s' % username)
     adduser(username)
 
     # create user's home directory if it doesn't exist.