From interchange-cvs at icdevgroup.org Wed Jul 5 22:18:16 2017 From: interchange-cvs at icdevgroup.org (Josh Lavin) Date: Wed, 05 Jul 2017 22:18:16 +0000 Subject: [interchange] Log the actual error, as order-desk version does Message-ID: commit 645eb9bcd3b482d949c5c8b6230d75ba45e5e80d Author: Josh Lavin Date: Wed Jul 5 15:17:42 2017 -0700 Log the actual error, as order-desk version does dist/strap/etc/log_transaction | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) --- diff --git a/dist/strap/etc/log_transaction b/dist/strap/etc/log_transaction index 764dbea..a594db3 100644 --- a/dist/strap/etc/log_transaction +++ b/dist/strap/etc/log_transaction @@ -281,7 +281,7 @@ Set order number in session: [calc] [/seti] Auto-created user [seti auto_username][data session username][/seti][scratch auto_username]. [else] - Auto-create of user failed. + Auto-create of user failed. Reason: [data session failure] [perl] die errmsg("Auto-create of user failed."); [/perl] [/else] [/if] From interchange-cvs at icdevgroup.org Tue Jul 25 15:45:34 2017 From: interchange-cvs at icdevgroup.org (Josh Lavin) Date: Tue, 25 Jul 2017 15:45:34 +0000 Subject: [interchange] Add Perl versions 5.24 & 5.26 to TravisCI Message-ID: commit 1a6f02f6b80619c46838daa42a52a4a2ed088324 Author: Josh Lavin Date: Mon Jul 24 16:40:22 2017 -0700 Add Perl versions 5.24 & 5.26 to TravisCI - also don't specify point-release on 5.10 (allow TravisCI to use pre-built latest) .travis.yml | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) --- diff --git a/.travis.yml b/.travis.yml index 08dc97f..aba8ea2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,15 @@ language: perl perl: - "5.8.9" - - "5.10.1" + - "5.10" - "5.12" - "5.14" - "5.16" - "5.18" - "5.20" - "5.22" + - "5.24" + - "5.26" sudo: false services: - mysql From interchange-cvs at icdevgroup.org Tue Jul 25 15:45:39 2017 From: interchange-cvs at icdevgroup.org (Josh Lavin) Date: Tue, 25 Jul 2017 15:45:39 +0000 Subject: [interchange] in Perl 5.26, @INC no longer includes current dir Message-ID: commit 2f4212b67b0c3ccfa2741bb7be4c1036afe226ca Author: Josh Lavin Date: Tue Jul 25 08:40:39 2017 -0700 in Perl 5.26, @INC no longer includes current dir - prefix path with current dir relocate.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) --- diff --git a/relocate.pl b/relocate.pl index 2df58ff..ac9617e 100644 --- a/relocate.pl +++ b/relocate.pl @@ -22,7 +22,7 @@ use strict; use Config; -require 'scripts/initp.pl'; +require './scripts/initp.pl'; sub doit { my ($key) = @_; From interchange-cvs at icdevgroup.org Tue Jul 25 15:45:44 2017 From: interchange-cvs at icdevgroup.org (Josh Lavin) Date: Tue, 25 Jul 2017 15:45:44 +0000 Subject: [interchange] Escape left brace Message-ID: commit 4a3c083ec6c7e3affd87bfc667c6cd5114963109 Author: Josh Lavin Date: Tue Jul 25 08:40:53 2017 -0700 Escape left brace unescaped is deprecated in Perl 5.26, fatal in 5.30 lib/Vend/Table/Editor.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) --- diff --git a/lib/Vend/Table/Editor.pm b/lib/Vend/Table/Editor.pm index dd44f93..d9c61b0 100644 --- a/lib/Vend/Table/Editor.pm +++ b/lib/Vend/Table/Editor.pm @@ -1064,7 +1064,7 @@ EOF } else { # Strip the {TAG} {/TAG} pairs if nothing there - $template =~ s#{([A-Z_]+)}(.*?){/\1}#$sub{$1} ? $2: '' #ges; + $template =~ s#\{([A-Z_]+)\}(.*?)\{/\1\}#$sub{$1} ? $2: '' #ges; # Insert the TAG $sub{HELP_URL} ||= 'javascript:void(0)'; $template =~ s/\$([A-Z_]+)\$/$sub{$1}/g;