Merge ~cjwatson/launchpad:stagingsetup-syntax into launchpad:master

Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: 3c17ea336e2d78c670ddd65ed77deeba73a93e32
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:stagingsetup-syntax
Merge into: launchpad:master
Diff against target: 13 lines (+1/-1)
1 file modified
database/replication/Makefile (+1/-1)
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+452659@code.launchpad.net

Commit message

Fix syntax error in stagingsetup

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) wrote :

Self-approving (trivial).

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/database/replication/Makefile b/database/replication/Makefile
2index c8de967..a2c1b8e 100644
3--- a/database/replication/Makefile
4+++ b/database/replication/Makefile
5@@ -100,7 +100,7 @@ stagingsetup:
6 # Restore the database. We need to restore permissions, despite
7 # later running security.py, to pull in permissions granted on
8 # production to users not maintained by security.py.
9- < ${STAGING_DUMP} ${STAGING_WALBLOCK}
10+ < ${STAGING_DUMP} ${STAGING_WALBLOCK} \
11 | pg_restore --dbname=${STAGING_DBNAME_MAIN} --no-owner ${EXIT_ON_ERROR} \
12 --use-list=${DUMPLIST} -v
13 rm ${DUMPLIST}

Subscribers

People subscribed via source and target branches

to status/vote changes: