[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0rc2-118-g6b60b5644

[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  6b60b5644c05917f09fb75894174e9bc1dc66834 (commit)
      from  f24ef85568c1c38b81b36cbceab60d298d103dab (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 6b60b5644c05917f09fb75894174e9bc1dc66834
Author: Sandro Santilli <strk at kbt.io>
Date:   Tue Sep 20 09:23:12 2022 +0200

    Fix NOTICE of non-requested extension not being core PostGIS

diff --git a/loader/postgis.pl b/loader/postgis.pl
index 6c5509699..7b1f5b675 100644
--- a/loader/postgis.pl
+++ b/loader/postgis.pl
@@ -54,25 +54,31 @@ sub install_upgrade_from
 	die "'${from}': invalid version, only 3 dot-separated numbers optionally followed by alphanumeric string are allowed\n"
 		unless $from =~ /^[0-9]*\.[0-9]*\.[0-9]*[a-z1-9]*/;
 
-	# Reserver versions
-	my %supported_extension = %SUPPORTED_EXTENSIONS;
+	# extension to process
+	my %extensions = %SUPPORTED_EXTENSIONS;
+	my $glob = "postgis*.control";
+
 	if ( defined($EXTENSION) ) {
-		%supported_extension = (
+		%extensions = (
 			$EXTENSION => 1
-		)
+		);
+		$glob = $EXTENSION;
 	}
 
 	my $EXTDIR = ${SHAREDIR} . '/extension';
 
-	#for ls postgis*.control
-	while (my $cfile = glob("${EXTDIR}/postgis*.control")) {
+	while (my $cfile = glob("${EXTDIR}/${glob}")) {
 		# Do stuff
 		#print " CFILE: ${cfile}\n";
 		my $extname = basename($cfile, '.control');
 
-		unless ( exists( $supported_extension{$extname} ) )
+		unless ( exists( $extensions{$extname} ) )
 		{
-			print STDERR "NOTICE: extension [${extname}] is not a core PostGIS extension\n";
+			if ( defined($EXTENSION) )  {
+				print STDERR "ERROR: glob [${glob}] matched unrequested extension [${extname}]\n";
+			} else {
+				print STDERR "NOTICE: extension [${extname}] is not a core PostGIS extension\n";
+			}
 			next;
 		}
 

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

Summary of changes:
 loader/postgis.pl | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
PostGIS