pg_wrapper: Also accept --cluster=ver/name in a single argument.

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.

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*$/;