improve error message in pg_wrapper, adapt test suite

postgresql-common/pg_wrapper

@@ -16,7 +16,7 @@ my ($version, $cluster, $db, $port);
 if (defined $ENV{PGCLUSTER}) {
     ($version, $cluster) = split ('/', $ENV{PGCLUSTER}, 2);
     error 'Invalid version specified with $PGCLUSTER' unless version_exists $version;
-    error 'Invalid cluster specified with $PGCLUSTER' unless $cluster;
+    error 'No cluster specified with $PGCLUSTER' unless $cluster;
     error 'Cluster specified with $PGCLUSTER does not exist' unless cluster_exists $version, $cluster;
 }
 
@@ -28,7 +28,6 @@ for (my $i = 0; $i <= $#ARGV; ++$i) {
         ($version, $cluster) = split ('/', $ARGV[$i+1], 2);
         error 'Invalid version specified with --cluster' unless version_exists $version;
         error 'No cluster specified with --cluster' unless $cluster;
-
 	error 'Cluster does not exist' unless cluster_exists $version, $cluster;
 
         splice @ARGV, $i, 2;

postgresql-common/t/090_multicluster.t

@@ -48,7 +48,7 @@ unlike_program_out 'postgres', "psql -Atl", 0, qr/test\|postgres\|/,
     'PGCLUSTER selection (2)';
 $ENV{'PGCLUSTER'} = 'foo';
 like_program_out 'postgres', "psql -l", 1, 
-    qr/Invalid cluster specified with \$PGCLUSTER/, 
+    qr/Invalid version specified with \$PGCLUSTER/, 
     'invalid PGCLUSTER value';
 delete $ENV{'PGCLUSTER'};