[postgis-tickets] [SCM] PostGIS branch master updated. 3.1.0alpha2-97-ge7c3c7f

[git at osgeo.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".

The branch, master has been updated
       via  e7c3c7f2a5d46d27fa7a7a4b0886d263265e6b72 (commit)
      from  283a8c4733bbcfd6fd0e9cae0eb02850dd0acc94 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e7c3c7f2a5d46d27fa7a7a4b0886d263265e6b72
Author: Sandro Santilli <strk at kbt.io>
Date:   Mon Oct 26 22:07:38 2020 +0100

    Drop duplicated and mis-scoped variable, fixing PG13 unpackaged test
    
    Fixes #4643 for real
    Closes #4773

diff --git a/regress/run_test.pl b/regress/run_test.pl
index 7e4751e..8497ae4 100755
--- a/regress/run_test.pl
+++ b/regress/run_test.pl
@@ -431,7 +431,6 @@ my $geosver =  sql("select postgis_geos_version()");
 my $projver = sql("select postgis_proj_version()");
 my $libbuilddate = sql("select postgis_lib_build_date()");
 my $pgsqlver = sql("select version()");
-my $pgsqlvernum = sql("select current_setting('server_version_num')");
 my $gdalver = sql("select postgis_gdal_version()") if $OPT_WITH_RASTER;
 my $sfcgalver = sql("select postgis_sfcgal_version()") if $OPT_WITH_SFCGAL;
 my $scriptver = sql("select postgis_scripts_installed()");
@@ -1531,7 +1530,7 @@ sub package_extension_sql
 	my ($extname, $extver) = @_;
 	my $sql;
 
-	if ( $pgsqlvernum lt 130000 ) {
+	if ( $pgvernum lt 130000 ) {
 		$sql = "CREATE EXTENSION ${extname} VERSION '${extver}' FROM unpackaged;";
 	} else {
 		$sql = "CREATE EXTENSION ${extname} VERSION unpackaged;";

-----------------------------------------------------------------------

Summary of changes:
 regress/run_test.pl | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)


hooks/post-receive
-- 
PostGIS