From 1d2a64f66b54879707943f4330c9f982b192ea4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dylan=20A=C3=AFssi?= <dylan.aissi@collabora.com>
Date: Tue, 16 Jul 2024 16:25:23 +0200
Subject: [PATCH] Make skip messages consistent
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Dylan Aïssi <dylan.aissi@collabora.com>
---
bin/trigger-updates | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/bin/trigger-updates b/bin/trigger-updates
index a402b49..15c7fbd 100755
--- a/bin/trigger-updates
+++ b/bin/trigger-updates
@@ -50,8 +50,13 @@ def trigger_updates(gl, data, filterglob):
ref = report.get("base")["name"]
if report["branch"] not in trusted_sources.keys():
- logging.info(
- f'Skipping {package_name} {report["upstream"]["version"]} from {report["branch"]} because not in trusted sources'
+ print(
+ f"{path_with_namespace}:",
+ "Skip",
+ report["upstream"]["version"],
+ "from",
+ report["branch"],
+ "because not in trusted sources (whitelists.yaml)",
)
continue
@@ -59,8 +64,13 @@ def trigger_updates(gl, data, filterglob):
if args.only_security:
if not report["branch"].endswith("-security"):
should_trigger_security = False
- logging.debug(
- f'Skipping {package_name} {report["upstream"]["version"]} from {report["branch"]} due to --only-security'
+ print(
+ f"{path_with_namespace}:",
+ "Skip",
+ report["upstream"]["version"],
+ "from",
+ report["branch"],
+ "due to --only-security",
)
print(
--
GitLab