[freeside-commits] branch FREESIDE_4_BRANCH updated. 655d0f5576a9a5e217c3ea5930a96b47831884f4
Ivan
ivan at 420.am
Fri Nov 13 13:05:03 PST 2015
The branch, FREESIDE_4_BRANCH has been updated
via 655d0f5576a9a5e217c3ea5930a96b47831884f4 (commit)
from 410d81606237abe4ab1c916239bd2c5b884b5032 (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 655d0f5576a9a5e217c3ea5930a96b47831884f4
Author: Ivan Kohler <ivan at freeside.biz>
Date: Fri Nov 13 13:05:02 2015 -0800
no need for runtime dep on Net::OpenSSH
diff --git a/FS/FS/part_export/cardfortress.pm b/FS/FS/part_export/cardfortress.pm
index 154f979..8c94135 100644
--- a/FS/FS/part_export/cardfortress.pm
+++ b/FS/FS/part_export/cardfortress.pm
@@ -4,6 +4,7 @@ use strict;
use base 'FS::part_export';
use vars qw( %info );
use String::ShellQuote;
+use Net::OpenSSH;
#tie my %options, 'Tie::IxHash';
#;
@@ -21,8 +22,6 @@ sub rebless { shift; }
sub _export_insert {
my($self, $svc_acct) = (shift, shift);
- eval "use Net::OpenSSH;";
- return $@ if $@;
open my $def_in, '<', '/dev/null' or die "unable to open /dev/null";
my $ssh = Net::OpenSSH->new( $self->machine,
@@ -61,9 +60,6 @@ sub _export_delete {
#well, we're just going to disable them for now, but there you go
- eval "use Net::OpenSSH;";
- return $@ if $@;
-
open my $def_in, '<', '/dev/null' or die "unable to open /dev/null";
my $ssh = Net::OpenSSH->new( $self->machine,
default_stdin_fh => $def_in );
-----------------------------------------------------------------------
Summary of changes:
FS/FS/part_export/cardfortress.pm | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
More information about the freeside-commits
mailing list