mirror of
https://git.freebsd.org/ports.git
synced 2025-06-07 13:50:38 -04:00
af5e25786c
- escape "{" literal in regexps (was deprecated in Perl 5.22)
PR: 214308
Submitted by: moiseev@mezonplus.ru
20 lines
848 B
Perl
20 lines
848 B
Perl
--- lib/BackupPC/Lib.pm.orig 2016-11-08 08:12:44 UTC
|
|
+++ lib/BackupPC/Lib.pm
|
|
@@ -1097,7 +1097,7 @@ sub cmdVarSubstitute
|
|
#
|
|
# Replace scalar variables first
|
|
#
|
|
- $arg =~ s[\${(\w+)}(\+?)]{
|
|
+ $arg =~ s[\$\{(\w+)}(\+?)]{
|
|
exists($vars->{$1}) && ref($vars->{$1}) ne "ARRAY"
|
|
? ($2 eq "+" ? $bpc->shellEscape($vars->{$1}) : $vars->{$1})
|
|
: "\${$1}$2"
|
|
@@ -1106,7 +1106,7 @@ sub cmdVarSubstitute
|
|
# Now replicate any array arguments; this just works for just one
|
|
# array var in each argument.
|
|
#
|
|
- if ( $arg =~ m[(.*)\${(\w+)}(\+?)(.*)] && ref($vars->{$2}) eq "ARRAY" ) {
|
|
+ if ( $arg =~ m[(.*)\$\{(\w+)}(\+?)(.*)] && ref($vars->{$2}) eq "ARRAY" ) {
|
|
my $pre = $1;
|
|
my $var = $2;
|
|
my $esc = $3;
|