[libredis-perl] 01/02: Add patch from Syohei YOSHIDA fixing locale related build failures.
Niko Tyni
ntyni at moszumanska.debian.org
Sun Apr 3 19:20:04 UTC 2016
This is an automated email from the git hooks/post-receive script.
ntyni pushed a commit to branch master
in repository libredis-perl.
commit f9388f75c0ed1ae283a89f77b353c514d47e859a
Author: Niko Tyni <ntyni at debian.org>
Date: Sun Apr 3 22:13:03 2016 +0300
Add patch from Syohei YOSHIDA fixing locale related build failures.
Closes: #819908
---
debian/patches/fix-locale-ftbfs.patch | 35 +++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 36 insertions(+)
diff --git a/debian/patches/fix-locale-ftbfs.patch b/debian/patches/fix-locale-ftbfs.patch
new file mode 100644
index 0000000..66a3ac6
--- /dev/null
+++ b/debian/patches/fix-locale-ftbfs.patch
@@ -0,0 +1,35 @@
+From 155f19bd998cb1350dd067ec7b8c06738f9484e3 Mon Sep 17 00:00:00 2001
+From: Syohei YOSHIDA <syohex at gmail.com>
+Date: Tue, 9 Jun 2015 12:26:49 +0900
+Subject: [PATCH] Compare error number instead of error message for locale
+
+This test may be failed if test platform is not English locale.
+So we should compare error number rather than error message.
+
+Origin: https://patch-diff.githubusercontent.com/raw/PerlRedis/perl-redis/pull/112.patch
+Bug: https://github.com/PerlRedis/perl-redis/issues/111
+Bug-Debian: https://bugs.debian.org/819908
+---
+ t/11-timeout.t | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/t/11-timeout.t b/t/11-timeout.t
+index bc0268b..166bbfa 100644
+--- a/t/11-timeout.t
++++ b/t/11-timeout.t
+@@ -25,13 +25,12 @@ subtest "server doesn't replies quickly enough" => sub {
+ my $server = Test::SpawnRedisTimeoutServer::create_server_with_timeout(10);
+ my $redis = Redis->new(server => '127.0.0.1:' . $server->port, read_timeout => 1);
+ ok($redis);
+- my $msg1 = "Error while reading from Redis server: " . strerror(ETIMEDOUT);
+- my $msg2 = "Error while reading from Redis server: " . strerror(EWOULDBLOCK);
+ like(
+ exception { $redis->get('foo'); },
+- qr/$msg1|$msg2/,
++ qr/Error while reading from Redis server: /,
+ "the code died as expected",
+ );
++ ok($! == ETIMEDOUT || $! == EWOULDBLOCK);
+ };
+
+ subtest "server doesn't respond at connection (cnx_timeout)" => sub {
diff --git a/debian/patches/series b/debian/patches/series
index 5299247..801e70e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
spelling.patch
+fix-locale-ftbfs.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libredis-perl.git
More information about the Pkg-perl-cvs-commits
mailing list