diff --git a/debian/changelog b/debian/changelog index dff84e773cd54f5ef9300172f8dd8443a6c2d17c..fe3b5448beda91340e4c30280305ffc41c7440c3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ postgresql-common (158) UNRELEASED; urgency=medium * Move pg_{create,ctl,upgrade,drop}cluster.8 to section 1, they are in /usr/bin anyway. * pg_upgradecluster: Deprecate krb_srvname in 9.4. + * pg_wrapper: Also accept --cluster=ver/name in a single argument. * testsuite: Also mount /dev/shm; with -s, open shell on failure. * Start porting the postgresql-common framework to RedHat, backed by the PGDG PostgreSQL rpm packages. diff --git a/pg_wrapper b/pg_wrapper index 68a327df83f8ff8495c347b990c470a7bc0ee7b1..04ac5f04852448503168b6ef7e0aa865652121a8 100755 --- a/pg_wrapper +++ b/pg_wrapper @@ -49,6 +49,14 @@ for (my $i = 0; $i <= $#ARGV; ++$i) { splice @ARGV, $i, 2; last; + } elsif ($ARGV[$i] =~ /^--cluster=(\d+\.\d)\/(.+)/) { + ($version, $cluster) = ($1, $2); + $host = undef; # --cluster overrides $PGHOST env var + error 'Invalid version specified with --cluster' unless version_exists $version; + error 'No cluster specified with --cluster' unless $cluster; + + splice @ARGV, $i, 1; + last; } $port_specified = 1 if $ARGV[$i] =~ /^--port\b/ || $ARGV[$i] =~ /^-\w*p\w*\d*$/;