tags 591182 + patch
quit
Philipp Kern wrote:
> Your package failed to build from source when scheduled as a binNMU. Is it
> possible that it cannot cope with that fact and the + in the testcase harness
> is actually messing things up?
Makese sense to me.
Untested.
Signed-off-by: Jonathan Nieder <jrnie...@gmail.com>
---
diff --git a/src/t/100_dpkg_divert.t b/src/t/100_dpkg_divert.t
index 8d7b58d..4f0fb41 100644
--- a/src/t/100_dpkg_divert.t
+++ b/src/t/100_dpkg_divert.t
@@ -236,7 +236,7 @@ install_diversions('');
system("touch $testdir/foo");
call_divert(['--rename', '--add', "$testdir/foo"],
- expect_stdout_like =>
qr,Adding.*local.*diversion.*$testdir/foo.*$testdir/foo.distrib,,
+ expect_stdout_like =>
qr,Adding.*local.*diversion.*\Q$testdir\E/foo.*\Q$testdir\E/foo.distrib,,
expect_stderr => '');
ok(-e "$testdir/foo.distrib", "foo diverted");
ok(!-e "$testdir/foo", "foo diverted");
@@ -250,7 +250,7 @@ install_diversions('');
system("touch $testdir/foo");
call_divert(['--add', "$testdir/foo"],
- expect_stdout_like =>
qr,Adding.*local.*diversion.*$testdir/foo.*$testdir/foo.distrib,,
+ expect_stdout_like =>
qr,Adding.*local.*diversion.*\Q$testdir\E/foo.*\Q$testdir\E/foo.distrib,,
expect_stderr => '');
ok(!-e "$testdir/foo.distrib", "foo diverted");
ok(-e "$testdir/foo", "foo diverted");
@@ -408,7 +408,7 @@ call_divert(["--package", "baz", "--divert",
"$testdir/foo.my", "--remove", "$te
expect_failure => 1, expect_stderr_like =>qr/mismatch on
(package|divert-to)/);
call_divert(["--divert", "$testdir/foo.distrib", "--remove", "$testdir/foo"],
- expect_stdout_like => qr,Removing.*$testdir/foo,);
+ expect_stdout_like => qr,Removing.*\Q$testdir\E/foo,);
diversions_eq(<<EOF);
$testdir/bar
$testdir/bar.distrib
@@ -429,7 +429,7 @@ call_divert(["$testdir/bar"]);
call_divert(["$testdir/baz"]);
call_divert(["--remove", "$testdir/bar"],
- expect_stdout_like => qr,Removing.*$testdir/bar,);
+ expect_stdout_like => qr,Removing.*\Q$testdir\E/bar,);
diversions_eq(<<EOF);
$testdir/foo
$testdir/foo.distrib
@@ -469,7 +469,7 @@ system("touch $testdir/foo");
call_divert(["--rename", "$testdir/foo"]);
call_divert(["--test", "--rename", "--remove", "$testdir/foo"],
- expect_stdout_like => qr,Removing.*$testdir/foo,, expect_stderr =>
'');
+ expect_stdout_like => qr,Removing.*\Q$testdir\E/foo,,
expect_stderr => '');
ok(-e "$testdir/foo.distrib");
ok(!-e "$testdir/foo");
diversions_eq($diversions_added_foo_local);
--
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
