This is an automated email from the git hooks/post-receive script.
dmn pushed a commit to branch dam-bundle-2.0
in repository libcatalyst-modules-perl.
commit 5aa21215aad313c5308b4bf37fe4cd03a192e790
Author: Damyan Ivanov <d...@debian.org>
Date: Sun May 11 19:54:51 2014 +0000
add patch from John Napiorkowski fixing test failure in
Catalyst-Plugin-SubRequest with Catalyst 5.9
Closes: #747502 -- FTBFS
---
.../Catalyst-Plugin-SubRequest/Cat-5.9.patch | 40 ++++++++++++++++++++++
debian/patches/Catalyst-Plugin-SubRequest/series | 1 +
2 files changed, 41 insertions(+)
diff --git a/debian/patches/Catalyst-Plugin-SubRequest/Cat-5.9.patch
b/debian/patches/Catalyst-Plugin-SubRequest/Cat-5.9.patch
new file mode 100644
index 0000000..dae91c9
--- /dev/null
+++ b/debian/patches/Catalyst-Plugin-SubRequest/Cat-5.9.patch
@@ -0,0 +1,40 @@
+Description: compatibility with Catalyst 5.9
+ Taken from https://gist.github.com/jjn1056/9947765
+Author: John Napiorkowski
+Bug: https://rt.cpan.org/Public/Bug/Display.html?id=94392
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=747502
+
+--- a/lib/Catalyst/Plugin/SubRequest.pm
++++ b/lib/Catalyst/Plugin/SubRequest.pm
+@@ -102,18 +102,29 @@ sub sub_request_response {
+
+ # need this so that
+ my $writer = Catalyst::Plugin::SubRequest::Writer->new;
+- my $response_cb = sub { $writer };
++ my $response_cb = sub {
++ my $response = shift;
++ my ($status, $headers, $body) = @$response;
++ if($body) {
++ return;
++ } else {
++ return $writer;
++ }
++ };
++
+ my $i_ctx = $class->prepare( env => $env, response_cb => $response_cb );
+ $i_ctx->stash($stash);
+ $i_ctx->dispatch;
+ $i_ctx->finalize;
+ $c->stats->profile( end => 'subrequest: ' . $path ) if $c->debug;
+
+- $i_ctx->response->body($writer->body);
++ if($writer->_is_closed) {
++ $i_ctx->response->body($writer->body);
++ }
+
+ return $i_ctx->response;
+ }
+
+ package Catalyst::Plugin::SubRequest::Writer;
+ use Moose;
+ has body => (
diff --git a/debian/patches/Catalyst-Plugin-SubRequest/series
b/debian/patches/Catalyst-Plugin-SubRequest/series
new file mode 100644
index 0000000..2a6ebcc
--- /dev/null
+++ b/debian/patches/Catalyst-Plugin-SubRequest/series
@@ -0,0 +1 @@
+Cat-5.9.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-perl/packages/libcatalyst-modules-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
