From 1e9d422e4dcd25aa25d179a760d8164026fd1a09 Mon Sep 17 00:00:00 2001 From: James Pogran Date: Fri, 21 Aug 2015 21:06:15 -0400 Subject: [PATCH] (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. --- build/dsc.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/dsc.rake b/build/dsc.rake index af4e8c85d..de8065420 100644 --- 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"