[postgis-tickets] [SCM] PostGIS branch stable-3.2 updated. 3.2.3-22-ga47dc514b
git at osgeo.org
git at osgeo.org
Sat Oct 29 03:09:48 PDT 2022
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, stable-3.2 has been updated
via a47dc514b9f7a45cb8a0e579131ddf4e8bd5a0e6 (commit)
via 51bf030305fec0ffb74d9f2f856ca4d6664762f1 (commit)
from 730b2d49444d94eec52c36d57822c66b6c1e89d2 (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 a47dc514b9f7a45cb8a0e579131ddf4e8bd5a0e6
Author: Sandro Santilli <strk at kbt.io>
Date: Sat Oct 29 11:39:08 2022 +0200
Encode dependency of raster unpackaged sql on create_unpackage.pl
diff --git a/extensions/postgis_raster/Makefile.in b/extensions/postgis_raster/Makefile.in
index b7ede0af3..2268ff687 100644
--- a/extensions/postgis_raster/Makefile.in
+++ b/extensions/postgis_raster/Makefile.in
@@ -78,8 +78,8 @@ sql/$(EXTENSION)--$(EXTVERSION).sql: $(EXTENSION_SCRIPTS) | sql
sql/$(EXTENSION)--unpackaged.sql: Makefile | sql
echo "-- Nothing to do here" > $@
-sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql: $(EXTENSION_UNPACKAGED_UPGRADE_SCRIPTS) | ../../utils/create_unpackaged.pl sql/$(EXTENSION)--ANY--$(EXTVERSION).sql Makefile sql
- cat $^ | $(PERL) @top_srcdir@/utils/create_unpackaged.pl postgis_raster > $@
+sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql: sql/$(EXTENSION)--ANY--$(EXTVERSION).sql sql/$(EXTENSION)--$(EXTVERSION).sql ../../utils/create_unpackaged.pl Makefile | sql
+ cat sql/$(EXTENSION)--$(EXTVERSION).sql | $(PERL) @top_srcdir@/utils/create_unpackaged.pl $(EXTENSION) > $@
# Upgrade after packaging
cat sql/$(EXTENSION)--ANY--$(EXTVERSION).sql >> $@
commit 51bf030305fec0ffb74d9f2f856ca4d6664762f1
Author: Sandro Santilli <strk at kbt.io>
Date: Sat Oct 29 12:01:57 2022 +0200
Fix handling of multiline SQL defn in unpackaged script creation
diff --git a/utils/create_unpackaged.pl b/utils/create_unpackaged.pl
index b82d3b989..a50725158 100755
--- a/utils/create_unpackaged.pl
+++ b/utils/create_unpackaged.pl
@@ -147,7 +147,7 @@ sub add_if_not_exists
# in objects
die "Invalid characters in object definition: $obj" if $obj =~ /'/;
- $obj =~ m/([^ ]*) (.*)/;
+ $obj =~ m/([^ ]*) (.*)/s; # can be multiline
my $type = $1;
my $sig = $2;
-----------------------------------------------------------------------
Summary of changes:
extensions/postgis_raster/Makefile.in | 4 ++--
utils/create_unpackaged.pl | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list