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

'/guix/commit/build-aux/update-NEWS.scm?id=beab681b66017ca7ce71a9541021d240ee85398c'>commit</a><a href='/guix/diff/build-aux/update-NEWS.scm?id=beab681b66017ca7ce71a9541021d240ee85398c'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/build-aux/update-NEWS.scm'>
<input type='hidden' name='id' value='beab681b66017ca7ce71a9541021d240ee85398c'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=beab681b66017ca7ce71a9541021d240ee85398c'>root</a>/<a href='/guix/log/build-aux?id=beab681b66017ca7ce71a9541021d240ee85398c'>build-aux</a>/<a href='/guix/log/build-aux/update-NEWS.scm?id=beab681b66017ca7ce71a9541021d240ee85398c'>update-NEWS.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/build-aux/update-NEWS.scm?id=beab681b66017ca7ce71a9541021d240ee85398c&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-05-20 11:50:21 +0200'>2019-05-20</span></td><td><a href='/guix/commit/build-aux/update-NEWS.scm?id=996ecaf64e397341dbed70198032ce828040e5ac'>maint: update-NEWS: Track "gcc-toolchain", not "gcc".</a><span class='msg-avail'>...<span class='msg-tooltip'>This is a followup to d78010b81ee6ef4fd8803082e2f401b9e55b44db.

* build-aux/update-NEWS.scm (write-packages-updates)[important]: Replace
"gcc" by "gcc-toolchain".
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-12-05 00:08:34 +0100'>2018-12-05</span></td><td><a href='/guix/commit/build-aux/update-NEWS.scm?id=e3c03952be99419b958e98e5934fb3b86f71165d'>maint: update-NEWS: Don't produce full package lists.</a><span class='msg-avail'>...<span class='msg-tooltip'>The lists of new and upgraded packages in 'NEWS' had become way too long
and redundant with what 'guix pull' reports.

* build-aux/update-NEWS.scm (write-packages-added): Don't print ADDED.
(write-packages-updates)[important, table, latest, noteworthy]: New
variables.
Print NOTEWORTHY rather than all of UPGRADED.
(main): Print PREVIOUS-VERSION and NEW-VERSION.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-09-02 16:43:10 +0200'>2018-09-02</span></td><td><a href='/guix/commit/build-aux/update-NEWS.scm?id=fe634eaf93ba40862acdf62d7f197c6f19f0651c'>Add (guix describe) and use it to initialize '%package-search-path'.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/describe.scm: New file.
* Makefile.am (MODULES): Add it.
* gnu/packages.scm (%default-package-module-path): New variable.
(%package-module-path): Honor 'package-path-entries'.
* build-aux/update-NEWS.scm (main): Use %DEFAULT-PACKAGE-MODULE-PATH
instead of (last (%package-module-path)).
</span></span></td><td>Ludovic Courtès</td></tr>