projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
396e18e
)
don't try to run empty export commands on replace, #16143
author
mark
<mark>
Sun, 29 Jan 2012 06:15:22 +0000
(06:15 +0000)
committer
mark
<mark>
Sun, 29 Jan 2012 06:15:22 +0000
(06:15 +0000)
FS/FS/part_export/shellcommands.pm
patch
|
blob
|
history
diff --git
a/FS/FS/part_export/shellcommands.pm
b/FS/FS/part_export/shellcommands.pm
index
418ff14
..
5914630
100644
(file)
--- a/
FS/FS/part_export/shellcommands.pm
+++ b/
FS/FS/part_export/shellcommands.pm
@@
-353,6
+353,7
@@
sub _export_command {
$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_command {
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';
{