← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~cjwatson/charms/trusty/turnip/repo-store into lp:~canonical-launchpad-branches/charms/trusty/turnip/devel

 

Colin Watson has proposed merging lp:~cjwatson/charms/trusty/turnip/repo-store into lp:~canonical-launchpad-branches/charms/trusty/turnip/devel.

Commit message:
Set turnip's REPO_STORE environment variable to the value of data_dir.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/charms/trusty/turnip/repo-store/+merge/251346

Set turnip's REPO_STORE environment variable to the value of data_dir.  Otherwise data_dir is unused, and turnip tries to write to /var/tmp/git.launchpad.dev/ instead which is unlikely to be appropriate.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/charms/trusty/turnip/repo-store into lp:~canonical-launchpad-branches/charms/trusty/turnip/devel.
=== modified file 'hooks/services.py'
--- hooks/services.py	2015-02-18 20:51:24 +0000
+++ hooks/services.py	2015-02-28 00:28:46 +0000
@@ -30,6 +30,11 @@
                     owner=config['user'],
                     perms=0o755),
                 helpers.render_template(
+                    source='envs/REPO_STORE.j2',
+                    target='{}/REPO_STORE'.format(
+                        config['env_dir']),
+                    owner=config['user']),
+                helpers.render_template(
                     source='envs/LOG_DIR.j2',
                     target='{}/TURNIP_LOG_DIR'.format(
                         config['env_dir']),

=== added file 'templates/envs/REPO_STORE.j2'
--- templates/envs/REPO_STORE.j2	1970-01-01 00:00:00 +0000
+++ templates/envs/REPO_STORE.j2	2015-02-28 00:28:46 +0000
@@ -0,0 +1,1 @@
+{{ data_dir }}