From b41ff1359baf325376d41d8c1378e187a208cc8d Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Wed, 24 Apr 2019 14:03:01 -0700 Subject: [PATCH] no run-time CPAN deps, RT#83178 --- FS/FS/part_export/northern_911.pm | 9 ++------- debian/control | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/FS/FS/part_export/northern_911.pm b/FS/FS/part_export/northern_911.pm index 679f5daf6..789d839e2 100644 --- a/FS/FS/part_export/northern_911.pm +++ b/FS/FS/part_export/northern_911.pm @@ -1,10 +1,11 @@ package FS::part_export::northern_911; +use base 'FS::part_export'; use strict; use vars qw(@ISA %info); use Tie::IxHash; use FS::Record qw(qsearch dbh); -use base 'FS::part_export'; +use WebService::Northern911; use Data::Dumper; tie my %options, 'Tie::IxHash', @@ -22,9 +23,6 @@ tie my %options, 'Tie::IxHash', 'options' => \%options, 'no_machine' => 1, 'notes' => <<'END' -Requires installation of -WebService::Northern911 -from CPAN. END ); @@ -32,9 +30,6 @@ sub client { my $self = shift; if (!$self->get('client')) { - local $@; - eval "use WebService::Northern911"; - return "error loading WebService::Northern911 ($@)" if $@; $self->set('client', WebService::Northern911->new( vendor_code => $self->option('vendor_code'), diff --git a/debian/control b/debian/control index 8db053b4d..dfae6b0f0 100644 --- a/debian/control +++ b/debian/control @@ -102,7 +102,7 @@ Depends: aspell-en,gnupg,ghostscript,gsfonts,gzip,latex-xcolor, libgeo-streetaddress-us-perl, libbusiness-onlinepayment-perl, libnet-vitelity-perl (>= 0.05), libnet-sslglue-perl, libexpect-perl, libspreadsheet-parsexlsx-perl, libunicode-truncate-perl (>= 0.303-1), - libspreadsheet-xlsx-perl, libpod-simple-perl + libspreadsheet-xlsx-perl, libpod-simple-perl, libwebservice-northern911-perl Conflicts: libparams-classify-perl (>= 0.013-6) Replaces: freeside (<<4) Breaks: freeside (<<4) -- 2.11.0