[freeside-commits] branch master updated. 08ec199c66436f308f5ef090699d3b10ce932056

[Ivan]

The branch, master has been updated
       via  08ec199c66436f308f5ef090699d3b10ce932056 (commit)
      from  d8648be92fa4c30d9ca4377dc0ac8816438e1370 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 08ec199c66436f308f5ef090699d3b10ce932056
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Feb 6 10:22:59 2017 -0800

    netsapiens integration: deb dep on REST::Client rather than throw a runtime error, RT#74517

diff --git a/FS/FS/part_export/netsapiens.pm b/FS/FS/part_export/netsapiens.pm
index c72093d..ac78dbc 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;
 
- at 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
-<a href="http://search.cpan.org/dist/REST-Client">REST::Client</a>
-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 538a12d..7bf44d4 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

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/part_export/netsapiens.pm |   13 ++++---------
 debian/control                  |    3 ++-
 2 files changed, 6 insertions(+), 10 deletions(-)