Author: arkurth
Date: Mon Aug 31 18:08:13 2009
New Revision: 809681
URL: http://svn.apache.org/viewvc?rev=809681&view=rev
Log:
VCL-213
Fixed bug in the retrieve_image() subroutines in vmware.pm and xCAT.pm. They
were calling next instead of return. This caused an "Exiting subroutine via
next" error to occur.
Modified:
incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/vmware.pm
incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT.pm
Modified:
incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/vmware.pm
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/vmware.pm?rev=809681&r1=809680&r2=809681&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/vmware.pm
(original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/vmware.pm
Mon Aug 31 18:08:13 2009
@@ -2201,7 +2201,7 @@
}
else {
notify($ERRORS{'WARNING'}, 0, "failed to copy image $image_name
from $largest_partner_hostname");
- next;
+ return 0;
}
# Make sure image was copied
Modified: incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT.pm
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT.pm?rev=809681&r1=809680&r2=809681&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT.pm
(original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT.pm Mon
Aug 31 18:08:13 2009
@@ -2980,7 +2980,7 @@
}
else {
notify($ERRORS{'WARNING'}, 0, "failed to copy image $image_name
from $largest_partner_hostname");
- next;
+ return 0;
}
# Make sure image was copied
