[postgis-tickets] [SCM] PostGIS branch master updated. 3.4.0rc1-702-g457390319

[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  4573903191819ba7d1b1351792bbb417196f68d8 (commit)
       via  7e1691a314e5a5b4f5292c0849ea974cc1ab17fc (commit)
      from  65c8de96d423196376f4bbca36e4351f4f13da82 (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 4573903191819ba7d1b1351792bbb417196f68d8
Author: Sandro Santilli <strk at kbt.io>
Date:   Wed Oct 18 11:41:19 2023 +0200

    Don't bother checking empty lines

diff --git a/utils/postgis_restore.pl.in b/utils/postgis_restore.pl.in
index aa29679db..bf183d78e 100644
--- a/utils/postgis_restore.pl.in
+++ b/utils/postgis_restore.pl.in
@@ -132,6 +132,7 @@ while( my $l = <DUMP> ) {
 
   next if $l =~ /^\;/;
   my $sigHR = linesignature($l);
+  next unless length($sigHR);
   my $sig = $sigHR;
   # always skip associated comments associated to objects,
   # see https://trac.osgeo.org/postgis/ticket/3078

commit 7e1691a314e5a5b4f5292c0849ea974cc1ab17fc
Author: Sandro Santilli <strk at kbt.io>
Date:   Wed Oct 18 11:40:58 2023 +0200

    Skipp shelltype when type is skipped
    
    References #5569 in master branch (2.5.0dev)

diff --git a/utils/postgis_restore.pl.in b/utils/postgis_restore.pl.in
index 9ab3bdffd..aa29679db 100644
--- a/utils/postgis_restore.pl.in
+++ b/utils/postgis_restore.pl.in
@@ -136,6 +136,9 @@ while( my $l = <DUMP> ) {
   # always skip associated comments associated to objects,
   # see https://trac.osgeo.org/postgis/ticket/3078
   $sig =~ s/^COMMENT//g;
+  # always skip shelltype when type is skipped
+  # see https://trac.osgeo.org/postgis/ticket/5569#comment:16
+  $sig =~ s/^SHELLTYPE/TYPE/g;
   $sig =~ s/\s//g;
   $hasTopology = 1 if $sig eq 'SCHEMAtopology';
 

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

Summary of changes:
 utils/postgis_restore.pl.in | 4 ++++
 1 file changed, 4 insertions(+)


hooks/post-receive
-- 
PostGIS