7b25ffbcfb
attr: backport upsteam bugfix patches Signed-off-by: Zhiqiang Liu <liuzhiqiang26@huawei.com>
29 lines
776 B
Diff
29 lines
776 B
Diff
From 7caefe0a7206bf0da40fcea66c3292345abf24f9 Mon Sep 17 00:00:00 2001
|
|
From: Troy Dawson <tdawson@redhat.com>
|
|
Date: Mon, 24 Jul 2017 14:42:06 +0200
|
|
Subject: [PATCH 1/7] test: escape left brace in a regex in test/run
|
|
|
|
... to fix test-suite failure with perl-5.26.0
|
|
|
|
Bug: https://bugzilla.redhat.com/1473853
|
|
---
|
|
test/run | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/test/run b/test/run
|
|
index 4b1f8d0..07e916c 100755
|
|
--- a/test/run
|
|
+++ b/test/run
|
|
@@ -106,7 +106,7 @@ for (;;) {
|
|
if (defined $line) {
|
|
# Substitute %VAR and %{VAR} with environment variables.
|
|
$line =~ s[%(\w+)][$ENV{$1}]eg;
|
|
- $line =~ s[%{(\w+)}][$ENV{$1}]eg;
|
|
+ $line =~ s[%\{(\w+)}][$ENV{$1}]eg;
|
|
}
|
|
if (defined $line) {
|
|
if ($line =~ s/^\s*< ?//) {
|
|
--
|
|
1.8.3.1
|
|
|