Ratings and Reviews server

Merge lp:~fgallina/rnr-server/bootstrap-fixes into lp:rnr-server

  1. bootstrap-fixes
  2. Merge into trunk
Proposed by Fabián Ezequiel Gallina
Status: Merged
Approved by: Fabián Ezequiel Gallina
Approved revision: 260
Merged at revision: 260
Proposed branch: lp:~fgallina/rnr-server/bootstrap-fixes
Merge into: lp:rnr-server
Diff against target: 29 lines (+11/-2)
1 file modified
Makefile (+11/-2)
To merge this branch: bzr merge lp:~fgallina/rnr-server/bootstrap-fixes
Reviewer Review Type Date Requested Status
Martin Albisetti (community) Approve
Review via email: mp+229685@code.launchpad.net

Commit message

Generate default local_config at bootstrap if needed

To post a comment you must log in.
Revision history for this message
Martin Albisetti (beuno) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2014-08-05 16:58:03 +0000
3+++ Makefile 2014-08-05 20:09:03 +0000
4@@ -13,6 +13,15 @@
5 VIRTUALENV_DIR ?= ./virtualenv
6 VIRTUALENV_ARGS ?= --distribute --clear --system-site-packages
7
8+LOCAL_CONFIG_DIR = ../local_config
9+LOCAL_CONFIG_PATH := ${LOCAL_CONFIG_DIR}/local.cfg
10+
11+local-config:
12+ @if test ! -e $(LOCAL_CONFIG_PATH); then \
13+ mkdir -p $(LOCAL_CONFIG_DIR); \
14+ echo '[__main__]\nincludes = ${HERE}/django_project/config/devel.cfg' > $(LOCAL_CONFIG_PATH); \
15+ echo 'Generated devel local config.'; \
16+ fi;
17
18 sanitize-sourcedeps:
19 sed -e '1,/# Dependencies/d;s/^rnr-server/./g;s/bazaar.isd/bazaar.launchpad.net/g' config-manager.txt > $(CM_TMP_CONFIG)
20@@ -32,7 +41,7 @@
21 $(CM) update $(CM_TMP_CONFIG)
22 @rm $(CM_TMP_CONFIG)
23
24-bootstrap: sourcedeps virtualenv install-virtualenv-requirements
25+bootstrap: local-config sourcedeps virtualenv install-virtualenv-requirements
26
27-.PHONY: sanitize-sourcedeps clean-virtualenv virtualenv \
28+.PHONY: local-config sanitize-sourcedeps clean-virtualenv virtualenv \
29 install-virtualenv-requirements sourcedeps bootstrap

Subscribers

People subscribed via source and target branches