From: Jim Meyering <meyering@meta.com>
Date: Wed, 27 Dec 2023 14:52:50 +0000 (-0800)
Subject: maint: avoid a racy distcheck failure
X-Git-Tag: v1.16.90~36
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c8fcdede16b034260d779ff3f064b84d55064000;p=thirdparty%2Fautomake.git

maint: avoid a racy distcheck failure

* lib/am/distdir.am (am__remove_distdir): Use ";" not "&&" after
the chmod-running find, so that a failing find doesn't cause the
entire rule to fail.  This could happen when a directory like
doc/automake.t2d being processed by find is concurrently deleted
by another rule.
---

diff --git a/lib/am/distdir.am b/lib/am/distdir.am
index 301239de1..0dd3a2e3f 100644
--- a/lib/am/distdir.am
+++ b/lib/am/distdir.am
@@ -24,7 +24,7 @@ top_distdir = $(distdir)
 am__remove_distdir = \
   if test -d "$(distdir)"; then \
     find "$(distdir)" -type d ! -perm -700 -exec chmod u+rwx {} ';' \
-      && rm -rf "$(distdir)" \
+      ; rm -rf "$(distdir)" \
 ## On MSYS (1.0.17) it is not possible to remove a directory that is in
 ## use; so, if the first rm fails, we sleep some seconds and retry, to
 ## give pending processes some time to exit and "release" the directory