This is an automated email from the git hooks/post-receive script.
gregoa pushed a commit to branch master
in repository libdbix-class-schema-loader-perl.
commit 667e3e9f7d2ac832cf910353cd90141e4861cebd
Author: gregor herrmann <gre...@debian.org>
Date: Sun Jan 21 03:19:31 2018 +0100
Drop 0001-Disable-cloning-when-merging-hashes.patch
(fixed differently upstream).
---
.../0001-Disable-cloning-when-merging-hashes.patch | 46 ----------------------
debian/patches/series | 1 -
2 files changed, 47 deletions(-)
diff --git a/debian/patches/0001-Disable-cloning-when-merging-hashes.patch
b/debian/patches/0001-Disable-cloning-when-merging-hashes.patch
deleted file mode 100644
index 2a36baf..0000000
--- a/debian/patches/0001-Disable-cloning-when-merging-hashes.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 421f0c87f50862786b98934575d3f73a02119181 Mon Sep 17 00:00:00 2001
-From: Niko Tyni <nt...@debian.org>
-Date: Fri, 22 Dec 2017 19:40:14 +0200
-Subject: [PATCH] Disable cloning when merging hashes
-
-Newer versions of Hash::Merge changed their cloning
-behaviour, causing corruption of DBI handles.
-
-Bug: https://rt.cpan.org/Public/Bug/Display.html?id=123681
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=882618
----
- lib/DBIx/Class/Schema/Loader.pm | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/lib/DBIx/Class/Schema/Loader.pm b/lib/DBIx/Class/Schema/Loader.pm
-index d100408..1f879cf 100644
---- a/lib/DBIx/Class/Schema/Loader.pm
-+++ b/lib/DBIx/Class/Schema/Loader.pm
-@@ -10,7 +10,7 @@ use Scalar::Util 'weaken';
- use Sub::Util 'set_subname';
- use DBIx::Class::Schema::Loader::Utils 'array_eq';
- use Try::Tiny;
--use Hash::Merge 'merge';
-+use Hash::Merge;
- use namespace::clean;
-
- # Always remember to do all digits for the version even if they're 0
-@@ -232,10 +232,13 @@ sub _merge_state_from {
-
- $self->_copy_state_from($from);
-
-- $self->class_mappings(merge($orig_class_mappings, $self->class_mappings))
-+ my $merger = Hash::Merge->new;
-+ $merger->set_clone_behavior(0);
-+
-+ $self->class_mappings($merger->merge($orig_class_mappings,
$self->class_mappings))
- if $orig_class_mappings;
-
-- $self->source_registrations(merge($orig_source_registrations,
$self->source_registrations))
-+ $self->source_registrations($merger->merge($orig_source_registrations,
$self->source_registrations))
- if $orig_source_registrations;
- }
-
---
-2.15.1
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 2c6edf9..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Disable-cloning-when-merging-hashes.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-perl/packages/libdbix-class-schema-loader-perl.git
_______________________________________________
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits
