From 873b33fe1badd138c83b340d1c60c2e9366de00b Mon Sep 17 00:00:00 2001 From: Carmelo Messina Date: Fri, 24 Mar 2023 15:47:50 +0100 Subject: [PATCH] do not export the patch if it is tagged with NOEXPORT --- export-patch-list.sh | 5 +++++ export-single-patch.sh | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/export-patch-list.sh b/export-patch-list.sh index 3c1277c..41ef2bf 100644 --- a/export-patch-list.sh +++ b/export-patch-list.sh @@ -16,6 +16,11 @@ for patch in $ALLPATCHS_E; do if [[ "$PATCH_FILE" == *"Automated-domain-substitution"* ]]; then continue fi + PATCH_MESSAGE=$(git -C ~/chromium/src/ show -s $patch) + if [[ $PATCH_MESSAGE == *NOEXPORT:* ]] ; + then + continue + fi if [[ -z "$PATCH_FILE" ]]; then PATCH_FILE=00$(git -C ~/chromium/src/ show -s $patch | head -n 5 | tail -n 1 | xargs | tr " " - | tr [:punct:] -).patch fi diff --git a/export-single-patch.sh b/export-single-patch.sh index 648c27f..554fc5c 100644 --- a/export-single-patch.sh +++ b/export-single-patch.sh @@ -13,6 +13,13 @@ else echo Exporting new $patch ~/bromite/build/patches-new/$PATCH_FILE fi +PATCH_MESSAGE=$(git -C ~/chromium/src/ show -s $patch) +if [[ $PATCH_MESSAGE == *NOEXPORT:* ]] ; +then + echo Request NO export + exit 0 +fi + git -C ~/chromium/src/ format-patch -1 --keep-subject --stdout --full-index --zero-commit --no-signature $patch >~/bromite/build/patches-new/$PATCH_FILE echo " exported"