openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Drop file test before removal"

This commit is contained in:
Zuul 2019-11-22 23:01:01 +00:00 committed by Gerrit Code Review
parent c3434df84a 3ade96f768
commit 0d743872b7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/container-puppet.sh
View File

@ -121,7 +121,7 @@ if [ -z "$NO_ARCHIVE" ]; then
echo "Ensuring the removed config files are also purged in ${puppet_generated_path}:" echo "Ensuring the removed config files are also purged in ${puppet_generated_path}:"
cat $TMPFILE | sort cat $TMPFILE | sort
cat $TMPFILE | xargs -n1 -r -I{} \ cat $TMPFILE | xargs -n1 -r -I{} \
bash -c "test -f ${puppet_generated_path}/{} && rm -f ${puppet_generated_path}/{}" bash -c "rm -f ${puppet_generated_path}/{}"
exec 5>&1 exec 5>&1
exec 1>$TMPFILE2 exec 1>$TMPFILE2
find $rsync_srcs -newer $origin_of_time -not -path '/etc/puppet*' -print0 find $rsync_srcs -newer $origin_of_time -not -path '/etc/puppet*' -print0