Merge "container-puppet.sh: add -r to rm command" into stable/train

This commit is contained in:
Zuul 2020-02-08 05:25:01 +00:00 committed by Gerrit Code Review
commit cfd03a276f
1 changed files with 1 additions and 1 deletions

View File

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