magicicada server

Merge lp:~nataliabidart/magicicada-server/stop-idempotent into lp:magicicada-server

  1. stop-idempotent
  2. Merge into trunk
Proposed by Natalia Bidart
Status: Merged
Approved by: Facundo Batista
Approved revision: 50
Merged at revision: 50
Proposed branch: lp:~nataliabidart/magicicada-server/stop-idempotent
Merge into: lp:magicicada-server
Diff against target: 14 lines (+1/-3)
1 file modified
Makefile.db (+1/-3)
To merge this branch: bzr merge lp:~nataliabidart/magicicada-server/stop-idempotent
Reviewer Review Type Date Requested Status
Facundo Batista Approve
Review via email: mp+287388@code.launchpad.net

Commit message

- Make sure DB is properly teared down when running make stop-db.

To post a comment you must log in.
Revision history for this message
Facundo Batista (facundo) wrote :

Thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile.db'
2--- Makefile.db 2016-02-24 23:44:16 +0000
3+++ Makefile.db 2016-02-27 17:20:09 +0000
4@@ -27,9 +27,7 @@
5 ./lib/backends/db/scripts/schema --all
6
7 stop-db:
8- PGHOST=$(PGHOST) dropdb $(PGNAME)
9- $(PGCTL) stop -w -D $(DATA_DIR) -m smart
10- rm -rf $(PGHOST)
11+ PGHOST=$(PGHOST) dropdb $(PGNAME) || $(PGCTL) stop -w -D $(DATA_DIR) -m smart || rm -rf $(PGHOST)
12
13 reset-db:
14 PGHOST=$(PGHOST) dropdb $(PGNAME)

Subscribers

People subscribed via source and target branches

to all changes: