X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fpart_export%2Fgrandstream.pm;h=981eb1969584b815aa088e847e9100a67a6e4de2;hp=a3a8fd64a7cf9ee0e68db85b218277d587b55ec4;hb=5372897f367498972c96f5494e142e6e11b29eb8;hpb=f0132dafa8a636b0ffb265fd398e7e82cf3d55b1

diff --git a/FS/FS/part_export/grandstream.pm b/FS/FS/part_export/grandstream.pm
index a3a8fd64a..981eb1969 100644
--- a/FS/FS/part_export/grandstream.pm
+++ b/FS/FS/part_export/grandstream.pm
@@ -7,6 +7,7 @@ use MIME::Base64;
 use Tie::IxHash;
 use IPC::Run qw(run);
 use FS::CGI qw(rooturl);
+use Carp qw(carp);
 
 $DEBUG = 0;
 
@@ -50,6 +51,12 @@ sub rebless { shift; }
 sub gs_create_config {
   my($self, $mac, %opt) = (@_);
 
+  if ( $FS::svc_Common::noexport_hack ) {
+    carp 'gs_create_config() suppressed by noexport_hack'
+      if $self->option('debug') || $DEBUG;
+    return;
+  }
+
   eval "use Net::SCP;";
   die $@ if $@;
 
@@ -89,8 +96,7 @@ sub gs_create_config {
               'com.grandstream.cmd.TextEncoder',
               $mac, $filename, "$dir/cfg$mac",
             );
-  run \@cmd, '>&', \$out_and_err,
-      },
+  run \@cmd, '>&', \$out_and_err
     or die "grandstream encode failed: $out_and_err";
 
   unlink $filename;
@@ -132,6 +138,12 @@ sub gs_create {
 sub gs_delete {
   my($self, $mac) = (shift, shift);
 
+  if ( $FS::svc_Common::noexport_hack ) {
+    carp 'gs_delete() suppressed by noexport_hack'
+      if $self->option('debug') || $DEBUG;
+    return;
+  }
+
   $mac = sprintf('%012s', lc($mac));
 
   ssh_cmd( user => $self->option('user'),