Title: [opsview-perl] [717] Re-add patch removed in error when upgrading.
- Revision
- 717
- Author
- tvoon
- Date
- 2012-07-26 18:07:43 +0100 (Thu, 26 Jul 2012)
Log Message
Re-add patch removed in error when upgrading. Remove need for Catalyst::Engine::HTTP/CGI
as these are not used in Catalyst 5.9 anymore
Added Paths
Added: trunk/patches/Catalyst-Devel/02-par-file-inclusions.patch
===================================================================
--- trunk/patches/Catalyst-Devel/02-par-file-inclusions.patch (rev 0)
+++ trunk/patches/Catalyst-Devel/02-par-file-inclusions.patch 2012-07-26 17:07:43 UTC (rev 717)
@@ -0,0 +1,14 @@
+diff -ur Catalyst-Devel-1.33.original/lib/Module/Install/Catalyst.pm Catalyst-Devel-1.33/lib/Module/Install/Catalyst.pm
+--- Catalyst-Devel-1.33.original/lib/Module/Install/Catalyst.pm 2011-03-23 00:41:19.000000000 +0000
++++ Catalyst-Devel-1.33/lib/Module/Install/Catalyst.pm 2012-04-07 05:44:32.000000000 +0000
+@@ -381,7 +381,9 @@
+ 'p' => 1,
+ );
+ # do not replace the whole $opt{'a'} array; just push required default value
+- push @{$opt{'a'}}, grep( !/par.pl/, glob '.' );
++ # Opsview patch: Remove this otherwise is not possible to specify only some files, rather than
++ # everything
++ #push @{$opt{'a'}}, grep( !/par.pl/, glob '.' );
+
+ App::Packer::PAR->new(
+ frontend => 'Module::ScanDeps',
Added: trunk/patches/Catalyst-Devel/03-no-engine-required.patch
===================================================================
--- trunk/patches/Catalyst-Devel/03-no-engine-required.patch (rev 0)
+++ trunk/patches/Catalyst-Devel/03-no-engine-required.patch 2012-07-26 17:07:43 UTC (rev 717)
@@ -0,0 +1,14 @@
+diff -ur Catalyst-Devel-1.33.original//lib/Module/Install/Catalyst.pm Catalyst-Devel-1.33/lib/Module/Install/Catalyst.pm
+--- Catalyst-Devel-1.33.original//lib/Module/Install/Catalyst.pm 2011-03-23 00:41:19.000000000 +0000
++++ Catalyst-Devel-1.33/lib/Module/Install/Catalyst.pm 2012-07-26 16:57:38.000000000 +0000
+@@ -355,8 +355,8 @@
+ import $class;
+ require Catalyst::Helper;
+ require Catalyst::Test;
+- require Catalyst::Engine::HTTP;
+- require Catalyst::Engine::CGI;
++ #require Catalyst::Engine::HTTP; # Opsview: These need to be removed for Catalyst 5.9
++ #require Catalyst::Engine::CGI;
+ require Catalyst::Controller;
+ require Catalyst::Model;
+ require Catalyst::View;
_______________________________________________
Opsview-checkins mailing list
[email protected]
http://lists.opsview.org/lists/listinfo/opsview-checkins
