diff options
| author | Jan Nieuwenhuizen <janneke@gnu.org> | 2018-10-21 23:18:19 +0200 |
|---|---|---|
| committer | Jan Nieuwenhuizen <janneke@gnu.org> | 2018-10-21 23:19:35 +0200 |
| commit | cf7658f7cb5de0e17f4801faa84c378a4b40033e (patch) | |
| tree | 646fa120d67bb41868a543461700e62aa170b2c0 /gnu/packages/patches/quilt-test-fix-regex.patch | |
| parent | 09c5a5680a06011f985a84aa26fb890b3be453bd (diff) | |
| parent | ffddb42d6c510456997ee6de1c1b8026c9ce6d14 (diff) | |
Merge branch 'core-updates' into core-updates-next
Diffstat (limited to 'gnu/packages/patches/quilt-test-fix-regex.patch')
| -rw-r--r-- | gnu/packages/patches/quilt-test-fix-regex.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/gnu/packages/patches/quilt-test-fix-regex.patch b/gnu/packages/patches/quilt-test-fix-regex.patch new file mode 100644 index 0000000000..2e249ac55b --- /dev/null +++ b/gnu/packages/patches/quilt-test-fix-regex.patch @@ -0,0 +1,41 @@ +From 5193b137b5a9034ce79946edd40760df2f63a82a Mon Sep 17 00:00:00 2001 +From: Jean Delvare <jdelvare@suse.de> +Date: Tue, 25 Apr 2017 15:17:53 +0200 +Subject: test: Escape curly braces in regex + +Curly braces in perl regex are supposed to be escaped, recent +versions of perl complain when they aren't: + +Unescaped left brace in regex is deprecated, passed through in regex; marked by <-- HERE in m/%{ <-- HERE (\w+)}/ at ./run line 114. +Unescaped left brace in regex is deprecated, passed through in regex; marked by <-- HERE in m/%{ <-- HERE \?}/ at ./run line 290. + +Signed-off-by: Jean Delvare <jdelvare@suse.de> +--- + test/run | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/test/run b/test/run +index 942014e..03afc7a 100755 +--- a/test/run ++++ b/test/run +@@ -112,7 +112,7 @@ sub flush_output() + sub substitute_vars($) + { + my ($line) = @_; +- $line =~ s[%{(\w+)}][defined $ENV{$1} ? $ENV{$1} : ""]eg; ++ $line =~ s[%\{(\w+)\}][defined $ENV{$1} ? $ENV{$1} : ""]eg; + return $line; + } + +@@ -288,7 +288,7 @@ while (defined(my $line = <SOURCE>)) { + # Parse the next command + if ($line =~ s/^\s*\$ ?//) { + # Substitute %{?} with the last command's status +- $line =~ s[%{\?}][$last_status]eg; ++ $line =~ s[%\{\?\}][$last_status]eg; + + chomp($prog = substitute_vars($line)); + $prog_line = $lineno; +-- +cgit v1.0-41-gc330 + |