From 08ec199c66436f308f5ef090699d3b10ce932056 Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Mon, 6 Feb 2017 10:22:59 -0800 Subject: [PATCH] netsapiens integration: deb dep on REST::Client rather than throw a runtime error, RT#74517 --- FS/FS/part_export/netsapiens.pm | 13 ++++--------- debian/control | 3 ++- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/FS/FS/part_export/netsapiens.pm b/FS/FS/part_export/netsapiens.pm index c72093d00..ac78dbca5 100644 --- a/FS/FS/part_export/netsapiens.pm +++ b/FS/FS/part_export/netsapiens.pm @@ -1,13 +1,13 @@ package FS::part_export::netsapiens; +use base qw( FS::part_export ); -use vars qw(@ISA $me %info); +use vars qw( $me %info ); use MIME::Base64; use Tie::IxHash; -use FS::part_export; use Date::Format qw( time2str ); -use Regexp::Common qw/URI/; +use Regexp::Common qw( URI ); +use REST::Client; -@ISA = qw(FS::part_export); $me = '[FS::part_export::netsapiens]'; #These export options set default values for the various commands @@ -77,9 +77,6 @@ tie my %options, 'Tie::IxHash', 'options' => \%options, 'no_machine' => 1, 'notes' => <<'END' -Requires installation of -REST::Client -from CPAN. END ); @@ -118,8 +115,6 @@ sub _ns_command { # kludge to curb excessive paranoia in LWP 6.0+ local $ENV{'PERL_LWP_SSL_VERIFY_HOSTNAME'} = 0; - eval 'use REST::Client'; - die $@ if $@; my $ns = new REST::Client 'host'=>$self->option($prefix.'url'); diff --git a/debian/control b/debian/control index 538a12d6e..7bf44d48e 100644 --- a/debian/control +++ b/debian/control @@ -98,7 +98,8 @@ Depends: aspell-en,gnupg,ghostscript,gsfonts,gzip,latex-xcolor, libtry-tiny-perl, libnumber-phone-perl, libxml-libxml-simple-perl, libxml-writer-perl, libio-socket-ssl-perl, libmap-splat-perl, - libdatetime-format-ical-perl + libdatetime-format-ical-perl, + librest-client-perl Conflicts: libparams-classify-perl (>= 0.013-6) Suggests: libbusiness-onlinepayment-perl Description: Libraries for Freeside billing and trouble ticketing -- 2.11.0