diff options
author | DongHun Kwak <dh0128.kwak@samsung.com> | 2019-03-11 09:52:57 +0900 |
---|---|---|
committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2019-03-11 09:54:16 +0900 |
commit | a33a53096a19fd452482f14dc17ac1996e4c0a61 (patch) | |
tree | f7bc7f6a8cdb56067f58d2bb885e2c9a3f1696ad | |
parent | 97ec869cac06ac7c217e9f012d175dc624ab5e3f (diff) | |
download | intltool-tizen.tar.gz intltool-tizen.tar.bz2 intltool-tizen.zip |
Running intltool-update with Perl 5.26 fails:
"""
Unescaped left brace in regex is illegal here in regex; marked by <--
HERE in m/^(.*)\${ <-- HERE ?([A-Z_]+)}?(.*)$/ at
/home/joerg/Development/buildroot/host/usr/bin/intltool-update line
1065.
"""
Change-Id: I0f7bebb03bd1b11680744387111cba89ff7c5a2a
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
-rw-r--r-- | intltool-update.in | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/intltool-update.in b/intltool-update.in index df591c6..049f449 100644 --- a/intltool-update.in +++ b/intltool-update.in @@ -1061,7 +1061,7 @@ sub SubstituteVariable } } - if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/) + if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/) { my $rest = $3; my $untouched = $1; @@ -1189,10 +1189,10 @@ sub FindPackageName $name =~ s/\(+$//g; $version =~ s/\(+$//g; - $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/); - $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/); - $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/); - $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/); + $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/); + $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/); + $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/); + $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/); } if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m) @@ -1218,11 +1218,11 @@ sub FindPackageName $version =~ s/\(+$//g; $bugurl =~ s/\(+$//g if (defined $bugurl); - $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/); - $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/); - $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/); - $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/); - $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/); + $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/); + $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/); + $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/); + $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/); + $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+}?/); } # \s makes this not work, why? |