Author: arkurth
Date: Fri Nov 16 17:26:17 2012
New Revision: 1410494
URL: http://svn.apache.org/viewvc?rev=1410494&view=rev
Log:
Merged revision(s) 1410493 from vcl/trunk/managementnode/lib/VCL/image.pm:
Fixed arguments to get_management_node_sysadmin_email in image.pm which were
intended to suppress warning messages if the value is not defined. They were
set to 1 but should be set to 0.
........
Modified:
vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/image.pm (contents,
props changed)
Modified: vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/image.pm
URL:
http://svn.apache.org/viewvc/vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/image.pm?rev=1410494&r1=1410493&r2=1410494&view=diff
==============================================================================
--- vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/image.pm (original)
+++ vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/image.pm Fri Nov 16
17:26:17 2012
@@ -102,7 +102,7 @@ sub process {
my $computer_type = $self->data->get_computer_type();
my $computer_shortname = $self->data->get_computer_short_name();
my $managementnode_shortname =
$self->data->get_management_node_short_name();
- my $sysadmin_mail_address =
$self->data->get_management_node_sysadmin_email(1);
+ my $sysadmin_mail_address =
$self->data->get_management_node_sysadmin_email(0);
if ($sysadmin_mail_address) {
# Notify administrators that image creation is starting
@@ -300,7 +300,7 @@ sub reservation_successful {
my $computer_id = $self->data->get_computer_id();
my $computer_shortname = $self->data->get_computer_short_name();
my $managementnode_shortname =
$self->data->get_management_node_short_name();
- my $sysadmin_mail_address =
$self->data->get_management_node_sysadmin_email(1);
+ my $sysadmin_mail_address =
$self->data->get_management_node_sysadmin_email(0);
# Send image creation successful email to user
my $body_user = <<"END";
@@ -381,7 +381,7 @@ sub reservation_failed {
my $computer_id = $self->data->get_computer_id();
my $computer_shortname = $self->data->get_computer_short_name();
my $managementnode_shortname =
$self->data->get_management_node_short_name();
- my $sysadmin_mail_address =
$self->data->get_management_node_sysadmin_email(1);
+ my $sysadmin_mail_address =
$self->data->get_management_node_sysadmin_email(0);
# Image process failed
notify($ERRORS{'CRITICAL'}, 0, "$image_name image creation failed");
Propchange: vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/image.pm
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 16 17:26:17 2012
@@ -0,0 +1 @@
+/vcl/trunk/managementnode/lib/VCL/image.pm:1378995,1383454,1410493
