MAAS

Merge ~adam-collard/maas:update-initial-sql-fixes into maas:master

  1. Git
  2. lp:~adam-collard/maas
  3. update-initial-sql-fixes
  4. Merge into master
Proposed by Adam Collard
Status: Merged
Approved by: Adam Collard
Approved revision: 663618cefa4b84d33f254c44860910cfa527c5c0
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~adam-collard/maas:update-initial-sql-fixes
Merge into: maas:master
Diff against target: 15 lines (+2/-2)
1 file modified
utilities/update-initial-sql (+2/-2)
Reviewer Review Type Date Requested Status
Alberto Donato (community) Approve
Review via email: mp+416609@code.launchpad.net

Commit message

Fixes to update-initial-sql

To post a comment you must log in.
Revision history for this message
Alberto Donato (ack) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/utilities/update-initial-sql b/utilities/update-initial-sql
2index a7fdeb8..bc1b163 100755
3--- a/utilities/update-initial-sql
4+++ b/utilities/update-initial-sql
5@@ -27,8 +27,8 @@ fi
6 msg "importing SQL dump"
7 psql -c "\i $sql_dump_file" >/dev/null
8
9-msg "cheching pending migrations"
10-if ! bin/maas-region showmigrations --list | grep -q '^ \[ \]'; then
11+msg "checking pending migrations"
12+if ! have_pending_migration; then
13 echo "no pending migration, $sql_dump_file is up to date"
14 exit 0
15 fi

Subscribers

People subscribed via source and target branches