aboutsummaryrefslogtreecommitdiffstats
diff options
authorAndrii Nakryiko <andrii@kernel.org>2024-11-08 10:25:33 -0800
committerDaniel Borkmann <daniel@iogearbox.net>2024-11-08 19:41:09 +0100
commit1d971ec23d423feba84f4719afc8323dbc607a4c (patch)
tree1fc3ca6959b11cf755ece194744fd34fdfbeecf9
parent9e50a90bc9696488dd834463a66d946f74b95104 (diff)
downloadpw-master.tar.gz
pw-apply: remove mbox.o before mb2q normalizationHEADmaster
mb2q --mboxout, apparently, will append new contents to existing mbox.o instead of overwriting the file. This leads to dangerous and confusing behavior if there are local mbox.o leftovers. Make sure that old mbox.o is gone before we do normalization. Signed-off-by: Andrii Nakryiko <andrii@kernel.org> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
-rwxr-xr-xpw-apply2
1 files changed, 1 insertions, 1 deletions
diff --git a/pw-apply b/pw-apply
index ccf6093..f49fcfc 100755
--- a/pw-apply
+++ b/pw-apply
@@ -160,7 +160,7 @@ fi
git checkout -b $branch $base
if [ ! -z "$mb2q_normalize" ]; then
- mb2q --mboxout mbox.o "$@" mbox.i
+ rm -f mbox.o && mb2q --mboxout mbox.o "$@" mbox.i
else
cp mbox.i mbox.o
fi