Commit b3bc8fd6 authored by Christoph Berg's avatar Christoph Berg

t/030_errors.t: 9.3 renames unix_socket_directory to unix_socket_directories.

parent 6a778730
......@@ -11,7 +11,7 @@ postgresql-common (139) UNRELEASED; urgency=low
* testsuite: Require netcat-openbsd to be installed.
* testsute 005_PgCommon: Do the ipv4 tests before the ipv6 ones; skip
the ipv6 for perl <= 5.10 (i.e. on squeeze and lucid).
* PgCommon.pm, pg_ctlcluster, pg_createcluster: 9.3 renames
* PgCommon.pm, pg_ctlcluster, pg_createcluster, t/030_errors.t: 9.3 renames
unix_socket_directory to unix_socket_directories.
[ Martin Pitt ]
......
......@@ -90,7 +90,7 @@ open F, "+</etc/postgresql/$version/main/postgresql.conf" or
my @lines = <F>;
seek F, 0, 0 or die "seek: $!";
truncate F, 0;
@lines = grep !/^unix_socket_directory/, @lines;
@lines = grep !/^unix_socket_dir/, @lines; # <= 9.2: "_directory", >= 9.3: "_directories"
print F @lines;
close F;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment