Merge branch 'master' into fulv-issue-135

plone · May 8, 2020 · 7093e01 · 7093e01
2 parents d1ff88d + 4fd9ff0
commit 7093e01
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/HISTORY.txt b/HISTORY.txt
@@ -1,5 +1,7 @@
-(unreleased)
+1.3.9 unreleased
 
+- When copying buildout extra directory, preserve file modes.
+  [smcmahon]
 - Fix incorrect indentation with plone_zope_conf_additional
   [fulv]
 

diff --git a/tasks/main.yml b/tasks/main.yml
@@ -268,6 +268,7 @@
     backup=yes
     owner={{ instance_config.plone_buildout_user }}
     group={{ instance_config.plone_group }}
+    mode=preserve
   register: extra_dir_copy_result
   when: instance_config.plone_buildout_extra_dir