Author: arkurth
Date: Tue Nov 3 17:57:59 2015
New Revision: 1712359
URL: http://svn.apache.org/viewvc?rev=1712359&view=rev
Log:
VCL-916
Removed $output from notify messages in Linux.pm::get_available_space and
get_total_space to prevent undefined array reference warnings.
Modified:
vcl/trunk/managementnode/lib/VCL/Module/OS/Linux.pm
Modified: vcl/trunk/managementnode/lib/VCL/Module/OS/Linux.pm
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/Module/OS/Linux.pm?rev=1712359&r1=1712358&r2=1712359&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/Module/OS/Linux.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/Module/OS/Linux.pm Tue Nov 3 17:57:59 2015
@@ -1819,7 +1819,7 @@ sub get_available_space {
my $command = "stat -f \"$path\"";
my ($exit_status, $output) = $self->execute($command);
if (!defined($output)) {
- notify($ERRORS{'WARNING'}, 0, "failed to run command to
determine available space on $computer_short_name:\ncommand:
$command\noutput:\n" . join("\n", @$output));
+ notify($ERRORS{'WARNING'}, 0, "failed to execute command to
determine available space on $computer_short_name, command: $command");
return;
}
elsif (grep(/^stat: /i, @$output)) {
@@ -1890,7 +1890,7 @@ sub get_total_space {
my $command = "stat -f \"$path\"";
my ($exit_status, $output) = $self->execute($command);
if (!defined($output)) {
- notify($ERRORS{'WARNING'}, 0, "failed to run command to
determine available space on $computer_short_name:\ncommand:
$command\noutput:\n" . join("\n", @$output));
+ notify($ERRORS{'WARNING'}, 0, "failed to execute command to
determine available space on $computer_short_name, command: $command");
return;
}
elsif (grep(/^stat: /i, @$output)) {
@@ -5947,7 +5947,7 @@ sub _generate_ssh_private_key_file_helpe
if ($utility eq 'ssh-keygen') {
$command = "ssh-keygen -t $type -f \"$private_key_file_path\"
-N \"$passphrase\"";
$command .= " -b $bits" if (defined($bits) && length($bits));
- $comment .= " $options" if (defined($options) &&
length($options));
+ $command .= " $options" if (defined($options) &&
length($options));
$command .= " -C \"$comment\"" if (defined($comment) &&
length($comment));
}
elsif ($utility eq 'dropbearkey') {
