Merge lp:~cjwatson/launchpad/fix-database-setup-version-check into lp:launchpad

Proposed by Colin Watson
Status: Merged
Merged at revision: 18652
Proposed branch: lp:~cjwatson/launchpad/fix-database-setup-version-check
Merge into: lp:launchpad
Diff against target: 18 lines (+4/-2)
1 file modified
utilities/launchpad-database-setup (+4/-2)
To merge this branch: bzr merge lp:~cjwatson/launchpad/fix-database-setup-version-check
Reviewer Review Type Date Requested Status
William Grant code Approve
Review via email: mp+345471@code.launchpad.net

Commit message

Fix launchpad-database-setup to fail if a supported PostgreSQL version is not present.

To post a comment you must log in.
Revision history for this message
William Grant (wgrant) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'utilities/launchpad-database-setup'
2--- utilities/launchpad-database-setup 2016-11-14 11:57:35 +0000
3+++ utilities/launchpad-database-setup 2018-05-13 10:32:30 +0000
4@@ -18,10 +18,12 @@
5 # https://dev.launchpad.net/DatabaseSetup which are intended for
6 # initial Launchpad setup on an otherwise unconfigured postgresql instance
7
8-for pgversion in 9.3 9.5 9.6
9+pgversion=
10+for try_pgversion in 9.3 9.5 9.6
11 do
12- sudo grep -qs "^auto" /etc/postgresql/$pgversion/main/start.conf
13+ sudo grep -qs "^auto" /etc/postgresql/$try_pgversion/main/start.conf
14 if [ $? -eq 0 ]; then
15+ pgversion="$try_pgversion"
16 break
17 fi
18 done