From 3ade96f7688e890140bf80cc228d3fc057ef80dc Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Fri, 22 Nov 2019 10:22:39 -0700 Subject: [PATCH] Drop file test before removal If the file is already missing (e.g. has been removed already), the test -f will return 1 which fails the container-puppet.sh execution. The goal here is to just make sure the file is missing, so let's just try to removing it with only an rm -f. This is successful if the file is already missing so we don't need to check the file existance. Change-Id: I41bbff148267de6514bf5b88c344d18cb894ae01 Closes-Bug: #1853183 --- common/container-puppet.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/container-puppet.sh b/common/container-puppet.sh index 152905a0b0..b55550a34a 100644 --- a/common/container-puppet.sh +++ b/common/container-puppet.sh @@ -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