[SCM] Debian packaging of liblog-handler-perl branch, master, updated. debian/0.75-1-12-g909ce5e

Salvatore Bonaccorso carnil at debian.org
Wed Nov 21 19:42:53 UTC 2012


The following commit has been merged in the master branch:
commit 730231b3a34d7c084e65f8dbdd6562f46b1ad64f
Author: Salvatore Bonaccorso <carnil at debian.org>
Date:   Mon Nov 19 21:13:50 2012 +0100

    Add 0001-Fix-dbi_handle-validation-in-DBI.pm.patch patch
    
    Fix dbi_handle validation in Log::Handler::Output::DBI.
    
    See https://rt.cpan.org/Public/Bug/Display.html?id=81155

diff --git a/debian/patches/0001-Fix-dbi_handle-validation-in-DBI.pm.patch b/debian/patches/0001-Fix-dbi_handle-validation-in-DBI.pm.patch
new file mode 100644
index 0000000..3d35c9f
--- /dev/null
+++ b/debian/patches/0001-Fix-dbi_handle-validation-in-DBI.pm.patch
@@ -0,0 +1,38 @@
+Description: Fix dbi_handle validation in DBI.pm
+Origin: upstream
+Bug: https://rt.cpan.org/Public/Bug/Display.html?id=81155
+Forwarded: not-needed
+Author: Salvatore Bonaccorso <carnil at debian.org>
+Last-Update: 2012-11-19
+
+---
+ lib/Log/Handler/Output/DBI.pm |    6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/lib/Log/Handler/Output/DBI.pm b/lib/Log/Handler/Output/DBI.pm
+index 33ecb4b..71bc1a0 100644
+--- a/lib/Log/Handler/Output/DBI.pm
++++ b/lib/Log/Handler/Output/DBI.pm
+@@ -442,6 +442,10 @@ sub _validate {
+     my $class = shift;
+ 
+     my %options = Params::Validate::validate(@_, {
++        dbi_handle => {
++            type => Params::Validate::OBJECT,
++            optional => 1,
++        },
+         data_source => {
+             type => Params::Validate::SCALAR,
+             optional => 1,
+@@ -535,7 +539,7 @@ sub _validate {
+                 $cstr[0] .= ";port=$options{port}";
+             }
+         }
+-    } else {
++    } elsif (!defined $options{dbi_handle}) {
+         Carp::croak "Missing mandatory options data_source or database/dbname";
+     }
+ 
+-- 
+1.7.10.4
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..de53866
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Fix-dbi_handle-validation-in-DBI.pm.patch

-- 
Debian packaging of liblog-handler-perl



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