Merge pull request #66 from jpogran/bug/master/FM-2564-update-generat…

…ed-types-part-2 (FM-2564) Ensure rake task copies DSC resources to vendor folder
puppetlabs-toy-chest · Aug 24, 2015 · 4714ed7 · 4714ed7
2 parents d6ba5d0 + 1e9d422
commit 4714ed7
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"