launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #08133
[Merge] lp:~allenap/maas/make-sampledata-broken into lp:maas
Gavin Panella has proposed merging lp:~allenap/maas/make-sampledata-broken into lp:maas.
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~allenap/maas/make-sampledata-broken/+merge/107030
--
https://code.launchpad.net/~allenap/maas/make-sampledata-broken/+merge/107030
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~allenap/maas/make-sampledata-broken into lp:maas.
=== modified file 'Makefile'
--- Makefile 2012-05-22 16:06:05 +0000
+++ Makefile 2012-05-23 14:50:26 +0000
@@ -5,6 +5,11 @@
# JavaScript enum module (not modules).
js_enums := src/maasserver/static/js/enums.js
+# Prefix commands with this when they need access to the database.
+# Remember to add a dependency on bin/database from the targets in
+# which those commands appear.
+dbrun := bin/database --preserve run --
+
# For things that care, postgresfixture for example, we always want to
# use the "maas" databases.
export PGDATABASE := maas
@@ -85,8 +90,8 @@
docs/api.rst: bin/maas src/maasserver/api.py syncdb
bin/maas generate_api_doc > $@
-sampledata: bin/maas syncdb
- bin/maas loaddata src/maasserver/fixtures/dev_fixture.yaml
+sampledata: bin/maas bin/database syncdb
+ $(dbrun) bin/maas loaddata src/maasserver/fixtures/dev_fixture.yaml
doc: bin/sphinx docs/api.rst
bin/sphinx
@@ -114,18 +119,16 @@
$(RM) -r run/* services/*/supervise
$(RM) twisted/plugins/dropin.cache
-harness: run = bin/database --preserve run --
harness: bin/maas bin/database
- $(run) bin/maas shell --settings=maas.demo
+ $(dbrun) bin/maas shell --settings=maas.demo
dbharness: bin/database
bin/database --preserve shell
-syncdb: run = bin/database --preserve run --
syncdb: bin/maas bin/database
- $(run) bin/maas syncdb --noinput
- $(run) bin/maas migrate maasserver --noinput
- $(run) bin/maas migrate metadataserver --noinput
+ $(dbrun) bin/maas syncdb --noinput
+ $(dbrun) bin/maas migrate maasserver --noinput
+ $(dbrun) bin/maas migrate metadataserver --noinput
define phony_targets
build