[postgis-tickets] [SCM] PostGIS branch master updated. 3.1.0alpha1-133-g083cd23

[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  083cd23afe81c455503c4c084193b67fab6494d6 (commit)
      from  e88c66f79ed8921b4de01fd82e1367cce373873c (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 083cd23afe81c455503c4c084193b67fab6494d6
Author: Sandro Santilli <strk at kbt.io>
Date:   Tue Jun 16 15:44:49 2020 +0200

    Allow {regdir} keyword substitution in .opts files, use in mfile.opts

diff --git a/regress/loader/mfile.opts b/regress/loader/mfile.opts
index d7f498c..e1964f8 100644
--- a/regress/loader/mfile.opts
+++ b/regress/loader/mfile.opts
@@ -1,2 +1,2 @@
 # The DBF with short names mapped to longer
--m ../loader/mfile_mapping.txt
+-m {regdir}/loader/mfile_mapping.txt
diff --git a/regress/run_test.pl b/regress/run_test.pl
index 17a4e18..941fad7 100755
--- a/regress/run_test.pl
+++ b/regress/run_test.pl
@@ -1093,10 +1093,14 @@ sub run_loader_test
 	if ( -r $opts_file )
 	{
 		open(FILE, $opts_file);
-		my @opts = <FILE>;
+		my @opts;
+		while (<FILE>) {
+			next if /^\s*#/;
+			chop;
+			s/{regdir}/$REGDIR/;
+			push @opts, $_;
+		}
 		close(FILE);
-		@opts = grep(!/^\s*#/, @opts);
-		map(s/\n//, @opts);
 		$custom_opts = join(" ", @opts);
 	}
 

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

Summary of changes:
 regress/loader/mfile.opts |  2 +-
 regress/run_test.pl       | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
PostGIS