Author: arkurth
Date: Fri Sep 14 14:56:22 2012
New Revision: 1384808
URL: http://svn.apache.org/viewvc?rev=1384808&view=rev
Log:
Merged revision(s) 1384801 from
vcl/trunk/managementnode/lib/VCL/Module/Provisioning.pm:
VCL-625
Fixed problem introduced in previous commit to Provisioning.pm::retrieve_image.
It was adding an extra period before the extension when retrieving files from
another management node.
Modified:
vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/Module/Provisioning.pm
(contents, props changed)
Modified:
vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/Module/Provisioning.pm
URL:
http://svn.apache.org/viewvc/vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/Module/Provisioning.pm?rev=1384808&r1=1384807&r2=1384808&view=diff
==============================================================================
--- vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/Module/Provisioning.pm
(original)
+++ vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/Module/Provisioning.pm
Fri Sep 14 14:56:22 2012
@@ -393,7 +393,7 @@ sub retrieve_image {
next LINE;
}
- my $file_name = "$file_prefix.$file_extension";
+ my $file_name = "$file_prefix$file_extension";
$partner_info{$partner}{directory_paths}{$directory_path}{file_paths}{$file_path}{file_name}
= $file_name;
$partner_info{$partner}{directory_paths}{$directory_path}{file_paths}{$file_path}{file_size}
= $file_size;
$partner_info{$partner}{directory_paths}{$directory_path}{image_size} +=
$file_size;
Propchange:
vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/Module/Provisioning.pm
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Sep 14 14:56:22 2012
@@ -0,0 +1 @@
+/vcl/trunk/managementnode/lib/VCL/Module/Provisioning.pm:1384801