From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 07 Dec 2023 12:10:11 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1rBCGg-006uE5-36 for lore@lore.pengutronix.de; Thu, 07 Dec 2023 12:10:11 +0100 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1rBCGh-0002qF-38; Thu, 07 Dec 2023 12:10:11 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rBCGO-0002pl-IW; Thu, 07 Dec 2023 12:09:52 +0100 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rBCGO-00EAVe-6G; Thu, 07 Dec 2023 12:09:52 +0100 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rBCGO-005ZdG-0U; Thu, 07 Dec 2023 12:09:52 +0100 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Thu, 7 Dec 2023 12:09:52 +0100 Message-Id: <20231207110952.1328603-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231129093743.906378-2-u.kleine-koenig@pengutronix.de> References: <20231129093743.906378-2-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] git-ptx-patches: Fix a race condition X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as 53de5f3e2e53582238bbd594aaa4749549672fb6. Michael [sent from post-receive hook] On Thu, 07 Dec 2023 12:09:52 +0100, Uwe Kleine-König wrote: > As the loop over the output of find moves files around, it can happen > that find lists files more than once. In that case not only the "From " > line is removed, but also the next one (usually the "From:" line). > > To process each patch in series.auto exactly once, iterate over that > file to remove the "From " line instead. Still be a bit conservative and > make sure that only the intended line is dropped. > > Reported-by: Thorsten Scherer > Signed-off-by: Uwe Kleine-König > Tested-by: Thorsten Scherer > Message-Id: <20231129093743.906378-2-u.kleine-koenig@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/scripts/git-ptx-patches b/scripts/git-ptx-patches > index a063cb73a875..df004fb8a8a5 100755 > --- a/scripts/git-ptx-patches > +++ b/scripts/git-ptx-patches > @@ -221,6 +221,13 @@ cat .ptxdist/series | _md5sum >> .ptxdist/series > > # The first line of the patch is 'From ...' > # remove it to avoid unnecessary changes in the patch files. > +while read patch para; do > + # There are no comments or empty lines in series.auto, so no need to > + # handle these. Also be a bit cautious to only remove lines matching > + # "^From ". > + sed -i '1{/^From /d}' ".ptxdist/patches/$patch" > +done < .ptxdist/series.auto > + > find .ptxdist/patches/ ! -type d | sed -e 's,^.ptxdist/patches/,,' | \ > while read patch para; do > case "$patch" in > @@ -228,9 +235,8 @@ while read patch para; do > *) ;; > esac > if grep -q "$patch" .ptxdist/series.auto; then > - p=".ptxdist/patches/$patch" > - tail -n+2 "$p" > ".$patch.ptx-patches" > - mv ".$patch.ptx-patches" "$p" > + # ok, this is one of the patches we just touched > + : > else > if grep -q "$patch" .ptxdist/series.{0,1}; then > echo "Base patch \"$patch\"!"