[libdbd-sqlite3-perl] 01/04: Add 0001-error-messages-have-been-slightly-changed-since-3.8..patch patch

Salvatore Bonaccorso carnil at debian.org
Sun Jan 12 12:19:44 UTC 2014


This is an automated email from the git hooks/post-receive script.

carnil pushed a commit to branch master
in repository libdbd-sqlite3-perl.

commit 335fbfee7cb701ffa7548b8da6a0e4780e9c7c51
Author: Salvatore Bonaccorso <carnil at debian.org>
Date:   Sun Jan 12 13:11:10 2014 +0100

    Add 0001-error-messages-have-been-slightly-changed-since-3.8..patch patch
    
    Fixes "FTBFS: test failures: UNIQUE constraint failed".
    
    Thanks: Dominic Hargreaves <dom at earth.li>
    
    Closes: #735022
---
 ...ges-have-been-slightly-changed-since-3.8..patch | 56 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 57 insertions(+)

diff --git a/debian/patches/0001-error-messages-have-been-slightly-changed-since-3.8..patch b/debian/patches/0001-error-messages-have-been-slightly-changed-since-3.8..patch
new file mode 100644
index 0000000..ee601a7
--- /dev/null
+++ b/debian/patches/0001-error-messages-have-been-slightly-changed-since-3.8..patch
@@ -0,0 +1,56 @@
+From f8a45b96f62742351c06fd956a4965004df7226d Mon Sep 17 00:00:00 2001
+From: Kenichi Ishigaki <ishigaki at cpan.org>
+Date: Thu, 9 Jan 2014 02:30:37 +0900
+Subject: [PATCH] error messages have been slightly changed since 3.8.2
+
+---
+ t/07_error.t                      | 2 +-
+ t/39_foreign_keys.t               | 4 ++--
+ t/rt_36838_unique_and_bus_error.t | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/t/07_error.t b/t/07_error.t
+index 68ea9ca..cf4fdb1 100644
+--- a/t/07_error.t
++++ b/t/07_error.t
+@@ -28,4 +28,4 @@ eval {
+ };
+ ok($@, 'Statement 2 generated an error');
+ is( $DBI::err, 19, '$DBI::err ok' );
+-like( $DBI::errstr, qr/column a is not unique/, '$DBI::errstr ok' );
++like( $DBI::errstr, qr/column a is not unique|UNIQUE constraint failed/, '$DBI::errstr ok' );
+diff --git a/t/39_foreign_keys.t b/t/39_foreign_keys.t
+index b7632fc..fc15d89 100644
+--- a/t/39_foreign_keys.t
++++ b/t/39_foreign_keys.t
+@@ -49,7 +49,7 @@ ok insert_track(13, "My Way", 2);
+ # column (3) does not correspond to row in the artist table.
+ 
+ ok !insert_track(14, "Mr. Bojangles", 3);
+-ok $@ =~ qr/foreign key constraint failed/;
++ok $@ =~ qr/foreign key constraint failed/i;
+ 
+ # This succeeds because a NULL is inserted into trackartist. A
+ # corresponding row in the artist table is not required in this case.
+@@ -62,7 +62,7 @@ ok insert_track(14, "Mr. Bojangles", undef);
+ # artist table.
+ 
+ ok !update_track(3, "Mr. Bojangles");
+-ok $@ =~ /foreign key constraint failed/;
++ok $@ =~ /foreign key constraint failed/i;
+ 
+ # Insert the required row into the artist table. It is then possible
+ # to update the inserted row to set trackartist to 3 (since a
+diff --git a/t/rt_36838_unique_and_bus_error.t b/t/rt_36838_unique_and_bus_error.t
+index 2c3a819..5a8aafe 100644
+--- a/t/rt_36838_unique_and_bus_error.t
++++ b/t/rt_36838_unique_and_bus_error.t
+@@ -17,4 +17,4 @@ $dbh->do("CREATE TABLE nums (num INTEGER UNIQUE)");
+ ok $dbh->do("INSERT INTO nums (num) VALUES (?)", undef, 1);
+ 
+ eval { $dbh->do("INSERT INTO nums (num) VALUES (?)", undef, 1); };
+-ok $@ =~ /column num is not unique/, $@;  # should not be a bus error
++ok $@ =~ /column num is not unique|UNIQUE constraint failed/, $@;  # should not be a bus error
+-- 
+1.8.5.2
+
diff --git a/debian/patches/series b/debian/patches/series
index 90c8520..447e56b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 use_system_sqlite
 fix-test-sort.patch
+0001-error-messages-have-been-slightly-changed-since-3.8..patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libdbd-sqlite3-perl.git



More information about the Pkg-perl-cvs-commits mailing list