From 5c62286a772098329de189f48b75b0fa47e7fe5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=8D=C3=B1igo=20Huguet?= Date: Mon, 23 Dec 2024 12:41:34 +0100 Subject: [PATCH] release, find-backports: formatting and log small fixes --- contrib/fedora/rpm/release.sh | 2 +- contrib/scripts/find-backports | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/contrib/fedora/rpm/release.sh b/contrib/fedora/rpm/release.sh index 8f79d60b4b..5a7e0c16de 100755 --- a/contrib/fedora/rpm/release.sh +++ b/contrib/fedora/rpm/release.sh @@ -412,7 +412,7 @@ fi if [ $CHECK_GITLAB = 1 ]; then if ! check_gitlab_pipeline "$CUR_BRANCH" "$CUR_HEAD" ; then - echo "Check the pipelines for branch \"$CUR_BRANCH\" at https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/pipelines?ref=$CUR_BRANCH" + echo "Check the pipelines for branch \"$CUR_BRANCH\" at https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/pipelines?ref=$CUR_BRANCH&source=push" echo "Wait for pipeline with \`ci-fairy wait-for-pipeline --project NetworkManager/NetworkManager --sha \"$CUR_HEAD\"\`" die "It seems not all gitlab-ci jobs were running/succeeding. Skip this check with --no-check-gitlab" fi diff --git a/contrib/scripts/find-backports b/contrib/scripts/find-backports index a131d91788..9211689212 100755 --- a/contrib/scripts/find-backports +++ b/contrib/scripts/find-backports @@ -193,7 +193,9 @@ def git_ref_commit_body(ref): def git_ref_commit_body_get_fixes(ref): body = git_ref_commit_body(ref) result = [] - for mo in re.finditer(re_bin("^\\s*[fF]ixes: *([0-9a-z]+)\\b"), body, flags=re.MULTILINE): + for mo in re.finditer( + re_bin("^\\s*[fF]ixes: *([0-9a-z]+)\\b"), body, flags=re.MULTILINE + ): c = mo.group(1).decode("ascii") h = git_ref_exists(c) if h: @@ -202,7 +204,9 @@ def git_ref_commit_body_get_fixes(ref): # The commit that contains a "Fixes:" line, can also contain an "Ignore-Fixes:" line # to disable it. This only makes sense with refs/notes/bugs notes, to fix up a wrong # annotation. - for mo in re.finditer(re_bin("^\\s*Ignore-[fF]ixes: *([0-9a-z]+)\\b"), body, flags=re.MULTILINE): + for mo in re.finditer( + re_bin("^\\s*Ignore-[fF]ixes: *([0-9a-z]+)\\b"), body, flags=re.MULTILINE + ): c = mo.group(1).decode("ascii") h = git_ref_exists(c) try: