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

[Colin Watson]

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

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'utilities/launchpad-database-setup'
--- utilities/launchpad-database-setup	2016-11-14 11:57:35 +0000
+++ utilities/launchpad-database-setup	2018-05-13 10:32:30 +0000
@@ -18,10 +18,12 @@
 # https://dev.launchpad.net/DatabaseSetup which are intended for
 # initial Launchpad setup on an otherwise unconfigured postgresql instance
 
-for pgversion in 9.3 9.5 9.6
+pgversion=
+for try_pgversion in 9.3 9.5 9.6
 do
-  sudo grep -qs "^auto" /etc/postgresql/$pgversion/main/start.conf
+  sudo grep -qs "^auto" /etc/postgresql/$try_pgversion/main/start.conf
   if [ $? -eq 0 ]; then
+    pgversion="$try_pgversion"
     break
   fi
 done