Merge lp:~abentley/charms/precise/juju-reports/develop-install into lp:~juju-qa/charms/precise/juju-reports/trunk

[Aaron Bentley]

This branch allows juju-reports to be installed in develop mode.

This is already possible to do after-the-fact, by running "make develop", but the charm has a tendency to re-do the install, breaking this.

[Curtis Hovey (sinzui)]

Thank you.

review: Approve (code)

=== modified file 'config.yaml'
--- config.yaml	2014-05-08 18:07:49 +0000
+++ config.yaml	2014-06-19 20:05:02 +0000
@@ -24,3 +24,7 @@
     type: boolean
     default: true
     description: "If enabled, run dist-clean when updating source code."
+  develop-install:
+    type: boolean
+    default: false
+    description: "If enabled, install in develop mode."
 
=== modified file 'hooks/common.py'
--- hooks/common.py	2014-06-18 14:19:08 +0000
+++ hooks/common.py	2014-06-19 20:05:02 +0000
@@ -122,11 +122,12 @@
     call_bzr(['revert', os.path.join(PROJECT_DIR, 'resources')])
 
 
-def install_production(dist_clean):
+def install_production(dist_clean, develop):
     subprocess.check_call(['make', 'deploydeps'], cwd=PROJECT_DIR)
     if dist_clean:
         subprocess.check_call(['make', 'distclean'], cwd=PROJECT_DIR)
-    subprocess.check_call(['make', 'prodinstall'], cwd=PROJECT_DIR)
+    target = 'install' if develop else 'prodinstall'
+    subprocess.check_call(['make', target], cwd=PROJECT_DIR)
     subprocess.check_call(['apt-get', 'autoremove', '--yes'])
 
 
@@ -194,7 +195,7 @@
         hookenv.log('Incomplete config: source')
         return
     update_source(config['source'], config['revno'])
-    install_production(config['dist-clean'])
+    install_production(config['dist-clean'], config['develop-install'])
     if mongo_url == '':
         hookenv.log('No mongodb set up.')
         return