Browse Source

Merge "Drop file test before removal"

tags/12.0.0
Zuul 2 weeks ago
parent
commit
0d743872b7
1 changed files with 1 additions and 1 deletions
  1. +1
    -1
      common/container-puppet.sh

+ 1
- 1
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}:"
cat $TMPFILE | sort
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 1>$TMPFILE2
find $rsync_srcs -newer $origin_of_time -not -path '/etc/puppet*' -print0

Loading…
Cancel
Save