[postgis-tickets] [SCM] PostGIS branch fix-upgrades-in-absence-of-old-library updated. 3.2.0-264-g8b934e52f

[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, fix-upgrades-in-absence-of-old-library has been updated
       via  8b934e52f7ba3e4d6d7244729fa01500f94683cc (commit)
       via  23321285607bc08fc50ea02d5f57af2270f91116 (commit)
       via  d026a315be25329e3956e8eda81dd2fe3d080d0c (commit)
      from  c2804639e68ff446f8e049ee67a611be638d1b64 (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 8b934e52f7ba3e4d6d7244729fa01500f94683cc
Merge: d026a315b 233212856
Author: Sandro Santilli <strk at kbt.io>
Date:   Sun Jan 16 23:03:55 2022 +0100

    Merge branch 'main' into fix-upgrades-in-absence-of-old-library


commit d026a315be25329e3956e8eda81dd2fe3d080d0c
Author: Sandro Santilli <strk at kbt.io>
Date:   Sun Jan 16 23:00:35 2022 +0100

    Revert "run_test.pl: include upgrade errors when in verbose mode"
    
    This reverts commit 9b186c4d3d23029f7164c54c9c6add440987cf3b.

diff --git a/regress/run_test.pl b/regress/run_test.pl
index a286540bb..9810a81d7 100755
--- a/regress/run_test.pl
+++ b/regress/run_test.pl
@@ -309,24 +309,22 @@ if ( $OPT_UPGRADE )
 	foreach my $hook (@OPT_HOOK_BEFORE_UPGRADE)
 	{
 		print "Running before-upgrade-script $hook\n";
-		fail("before-upgrade-script $hook", $REGRESS_LOG)
-		    unless load_sql_file($hook, 1);
+		die unless load_sql_file($hook, 1);
 	}
 
-	if ( $OPT_EXTENSIONS )
-	{
-		upgrade_spatial_extensions();
-	}
-	else
-	{
-		upgrade_spatial();
-	}
+  if ( $OPT_EXTENSIONS )
+  {
+    upgrade_spatial_extensions();
+  }
+  else
+  {
+	  upgrade_spatial();
+  }
 
 	foreach my $hook (@OPT_HOOK_AFTER_UPGRADE)
 	{
 		print "Running after-upgrade-script $hook\n";
-		fail("after-upgrade-script $hook", $REGRESS_LOG)
-		    unless load_sql_file($hook, 1);
+		die unless load_sql_file($hook, 1);
 	}
 
   # Update libver
@@ -1542,31 +1540,27 @@ sub upgrade_spatial
 
     my $script = "${STAGED_SCRIPTS_DIR}/postgis_upgrade.sql";
     print "Upgrading core\n";
-    fail('core upgrading', $REGRESS_LOG)
-        unless load_sql_file($script, 1);
+    die unless load_sql_file($script, 1);
 
     if ( $OPT_WITH_TOPO )
     {
         $script = "${STAGED_SCRIPTS_DIR}/topology_upgrade.sql";
         print "Upgrading topology\n";
-        fail('topology upgrade', $REGRESS_LOG)
-			unless load_sql_file($script, 1);
+        die unless load_sql_file($script, 1);
     }
 
     if ( $OPT_WITH_RASTER )
     {
         $script = "${STAGED_SCRIPTS_DIR}/rtpostgis_upgrade.sql";
         print "Upgrading raster\n";
-        fail('raster upgrade', $REGRESS_LOG)
-			unless load_sql_file($script, 1);
+        die unless load_sql_file($script, 1);
     }
 
     if ( $OPT_WITH_SFCGAL )
     {
         $script = "${STAGED_SCRIPTS_DIR}/sfcgal_upgrade.sql";
         print "Upgrading sfcgal\n";
-        fail('sfcgal upgrade', $REGRESS_LOG)
-			unless load_sql_file($script, 1);
+        die unless load_sql_file($script, 1);
     }
 
     return 1;

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

Summary of changes:
 regress/run_test.pl | 34 ++++++++++++++--------------------
 1 file changed, 14 insertions(+), 20 deletions(-)


hooks/post-receive
-- 
PostGIS