[freeside-commits] freeside/FS/FS/part_export shellcommands.pm, 1.57.4.4, 1.57.4.5

Mark Wells mark at wavetail.420.am
Sat Jan 28 22:15:24 PST 2012


Update of /home/cvs/cvsroot/freeside/FS/FS/part_export
In directory wavetail.420.am:/tmp/cvs-serv18871/FS/FS/part_export

Modified Files:
      Tag: FREESIDE_2_3_BRANCH
	shellcommands.pm 
Log Message:
don't try to run empty export commands on replace, #16143

Index: shellcommands.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_export/shellcommands.pm,v
retrieving revision 1.57.4.4
retrieving revision 1.57.4.5
diff -u -w -d -r1.57.4.4 -r1.57.4.5
--- shellcommands.pm	13 Dec 2011 21:15:57 -0000	1.57.4.4
+++ shellcommands.pm	29 Jan 2012 06:15:22 -0000	1.57.4.5
@@ -353,6 +353,7 @@
   $locale = shell_quote $locale;
 
   my $command_string = eval(qq("$command"));
+
   my @ssh_cmd_args = (
     user          => $self->option('user') || 'root',
     host          => $self->machine,
@@ -377,6 +378,7 @@
 sub _export_replace {
   my($self, $new, $old ) = (shift, shift, shift);
   my $command = $self->option('usermod');
+  return '' if $command =~ /^\s*$/;
   my $stdin = $self->option('usermod_stdin');
   no strict 'vars';
   {



More information about the freeside-commits mailing list