[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0rc2-146-g03cc059dc

[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  03cc059dc01b0fa39564d97295748e6f12bfebbc (commit)
      from  e954553b5fde92b6dd1b19766db1547f6a736152 (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 03cc059dc01b0fa39564d97295748e6f12bfebbc
Author: Sandro Santilli <strk at kbt.io>
Date:   Fri Sep 30 17:12:15 2022 +0200

    Do not assume .tmp file exists upon removal
    
    CirrusCI is failing not finding the file.
    Chances are multi-process make is building the same
    file multiple times and thus not finding it upon removing it
    
    A better fix would be useful (serializing those commands?)
    
    Should fix #5250

diff --git a/doc/Makefile.in b/doc/Makefile.in
index e6aee1809..f1d048b0c 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -188,7 +188,7 @@ $(XML_INPUTS_POT): $(srcdir)/po/templates/%.xml.pot: %.xml
       mv $@.tmp $@; \
     else \
       echo "$@ unchanged"; \
-      rm $@.tmp; \
+      rm -f $@.tmp; \
     fi; \
   else \
 	  $(XML2POT) $< > $@; \
diff --git a/extensions/address_standardizer/Makefile.in b/extensions/address_standardizer/Makefile.in
index d8fb62d25..653dc5b0f 100644
--- a/extensions/address_standardizer/Makefile.in
+++ b/extensions/address_standardizer/Makefile.in
@@ -68,7 +68,7 @@ sql/%.sql: %.sql.in | sql
 	$(SQLPP) -I at buiddir@/../libpgcommon $< > $@.tmp
 	grep -v '^#' $@.tmp | \
 	$(PERL) -lpe "s'MODULE_PATHNAME'\$(MODULEPATH)'g" > $@
-	rm $@.tmp
+	rm -f $@.tmp
 
 %.control: %.control.in Makefile
 	cat $< \
diff --git a/extensions/postgis/Makefile.in b/extensions/postgis/Makefile.in
index 53b1026e1..7b425b060 100644
--- a/extensions/postgis/Makefile.in
+++ b/extensions/postgis/Makefile.in
@@ -140,7 +140,7 @@ sql/postgis_for_extension.sql: ../../postgis/postgis.sql.in ../../postgis_revisi
 	$(PERL) -lpe \
 		"s'MODULE_PATHNAME'\$(MODULEPATH)'g" \
 		| $(PERL) -pe 's/BEGIN\;//g ; s/COMMIT\;//g' > $@
-	rm $@.tmp
+	rm -f $@.tmp
 
 sql/postgis_upgrade.sql: sql/postgis_upgrade_for_extension.sql | sql
 	$(PERL) -pe "s/BEGIN\;//g ; s/COMMIT\;//g; s/^(DROP .*)\;/SELECT postgis_extension_drop_if_exists('$(EXTENSION)', '\1');\n\1\;/" $< > $@
diff --git a/extensions/postgis_raster/Makefile.in b/extensions/postgis_raster/Makefile.in
index 1c118ccf0..8bac04f67 100644
--- a/extensions/postgis_raster/Makefile.in
+++ b/extensions/postgis_raster/Makefile.in
@@ -96,7 +96,7 @@ sql/rtpostgis_for_extension.sql: ../../raster/rt_pg/rtpostgis.sql.in ../../postg
 	$(SQLPP) -I at builddir@/../../postgis/ -I../../ $< > $@.tmp
 	grep -v '^#' $@.tmp | \
 	$(PERL) -lpe "s'MODULE_PATHNAME'\$(MODULEPATH)'g" > $@
-	rm $@.tmp
+	rm -f $@.tmp
 
 sql/rtpostgis_upgrade.sql: sql/rtpostgis_upgrade_for_extension.sql | sql
 	$(PERL) -pe "s/BEGIN\;//g ; s/COMMIT\;//g; s/^(DROP .*)\;/SELECT postgis_extension_drop_if_exists('$(EXTENSION)', '\1');\n\1\;/" $< > $@
diff --git a/postgis/Makefile.in b/postgis/Makefile.in
index 60e0a486f..b5aef0768 100644
--- a/postgis/Makefile.in
+++ b/postgis/Makefile.in
@@ -239,7 +239,7 @@ endif
 %.sql: %.sql.in
 	$(SQLPP) -I at top_srcdir@/libpgcommon -I at builddir@ $< > $@.tmp
 	grep -v '^#' $@.tmp | $(PERL) -lpe "s'MODULE_PATHNAME'\$(MODULEPATH)'g;s'@extschema@\.''g" > $@
-	rm $@.tmp
+	rm -f $@.tmp
 
 #this is redundant but trying to fold in with extension just hangs
 postgis_upgrade.sql.in: postgis.sql ../utils/create_upgrade.pl
diff --git a/raster/rt_pg/Makefile.in b/raster/rt_pg/Makefile.in
index 53cc52166..cbbf6db57 100644
--- a/raster/rt_pg/Makefile.in
+++ b/raster/rt_pg/Makefile.in
@@ -128,7 +128,7 @@ endif
 	$(SQLPP) -I at top_builddir@/postgis/ $< > $@.tmp
 	grep -v '^#' $@.tmp | \
 	$(PERL) -lpe "s'MODULE_PATHNAME'\$(MODULEPATH)'g;s'@extschema@\.''g" > $@
-	rm $@.tmp
+	rm -f $@.tmp
 
 ../../liblwgeom/.libs/liblwgeom.a:
 	$(MAKE) -C ../../liblwgeom
diff --git a/sfcgal/Makefile.in b/sfcgal/Makefile.in
index 93a5fcfc6..9776bb87d 100644
--- a/sfcgal/Makefile.in
+++ b/sfcgal/Makefile.in
@@ -125,7 +125,7 @@ $(SQL_OBJS): ../postgis_config.h ../postgis_revision.h
 	$(SQLPP) -I at top_builddir@/postgis $< > $@.tmp
 	grep -v '^#' $@.tmp | \
 	$(PERL) -lpe "s'MODULE_PATHNAME'\$(MODULEPATH)'g;s'@extschema@\.''g" > $@
-	rm $@.tmp
+	rm -f $@.tmp
 
 sfcgal_upgrade.sql.in: sfcgal.sql ../utils/create_upgrade.pl
 	$(PERL) @top_srcdir@/utils/create_upgrade.pl $< > $@
diff --git a/topology/Makefile.in b/topology/Makefile.in
index 842de0933..cc1558b71 100644
--- a/topology/Makefile.in
+++ b/topology/Makefile.in
@@ -105,7 +105,7 @@ endif
 	$(SQLPP) -I at top_builddir@/postgis $< > $@.tmp
 	grep -v '^#' $@.tmp | \
 	$(PERL) -lpe "s'MODULE_PATHNAME'\$(MODULEPATH)'g" > $@
-	rm $@.tmp
+	rm -f $@.tmp
 
 #Generate upgrade script by stripping things that can't be reinstalled
 #e.g. don't bother with tables, types, triggers, and domains

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

Summary of changes:
 doc/Makefile.in                             | 2 +-
 extensions/address_standardizer/Makefile.in | 2 +-
 extensions/postgis/Makefile.in              | 2 +-
 extensions/postgis_raster/Makefile.in       | 2 +-
 postgis/Makefile.in                         | 2 +-
 raster/rt_pg/Makefile.in                    | 2 +-
 sfcgal/Makefile.in                          | 2 +-
 topology/Makefile.in                        | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
PostGIS