(FM-2564) Ensure rake task copies DSC resources to vendor folder

A bug in the rake task prevents the xDscResources folder from being copied to the lib/puppet_x/dsc_resources folder when importing. This fix ensures the folder is copied.
puppetlabs-toy-chest · Aug 24, 2015 · 1e9d422 · 1e9d422
1 parent d6ba5d0
commit 1e9d422
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/build/dsc.rake b/build/dsc.rake
@@ -56,7 +56,7 @@ eod
       FileUtils.rm_rf "#{dsc_resources_path_tmp}/xDscResources/*/.git"
 
       puts "Copying vendored resources from #{dsc_resources_path_tmp}/xDscResources to #{vendor_dsc_resources_path}"
-      FileUtils.cp_r "#{dsc_resources_path_tmp}/xDscResources/.", vendor_dsc_resources_path
+      FileUtils.cp_r "#{dsc_resources_path_tmp}/xDscResources/.", vendor_dsc_resources_path, :remove_destination => true
       FileUtils.cp_r "#{dsc_resources_path_tmp}/xDscResources/.", dsc_resources_path
 
       puts "Copying vendored resources from #{default_dsc_module_path}/build/vendor/wmf_dsc_resources to #{vendor_dsc_resources_path}/dsc_resources"