diff options
| -rw-r--r-- | labbot/addons/approve-merge.py | 2 | ||||
| -rw-r--r-- | labbot/addons/merge-label.py | 6 | ||||
| -rw-r--r-- | labbot/addons/merge-stable.py | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/labbot/addons/approve-merge.py b/labbot/addons/approve-merge.py index 9c6eceb..7a9e54c 100644 --- a/labbot/addons/approve-merge.py +++ b/labbot/addons/approve-merge.py @@ -34,7 +34,7 @@ async def merge_label_hook(event, gl, *args, **kwargs): if merge_status == "can_be_merged": await gl.put(merge_url) else: - log.debug(f"Cannot merge !{iid} because of its merge_status `{merge_status}`") + log.debug(f"Cannot merge !{iid}({event.project_id}) because of its merge_status `{merge_status}`") def setup(bot): config.setup(__name__, bot.name) diff --git a/labbot/addons/merge-label.py b/labbot/addons/merge-label.py index eead985..2b6dffa 100644 --- a/labbot/addons/merge-label.py +++ b/labbot/addons/merge-label.py @@ -79,13 +79,15 @@ async def merge_label_hook(event, gl, *args, **kwargs): has_label = False issue_data = await gl.getitem(base_url) - for label in issue_data["labels"]: + issue_labels = issue_data["labels"] + for label in issue_labels: if label in config["act_labels"] or label in config["state_label"].values(): has_label = True break if not has_label: - log.debug(f"Issue #{issue} does not have a relevant label") + label_str = ", ".join(issue_labels) + log.debug(f"Issue #{issue}({event.project_id}) does not have a relevant label (has: '{label_str}')") continue delete_labels = config["act_labels"] + list(config["state_label"].values()) diff --git a/labbot/addons/merge-stable.py b/labbot/addons/merge-stable.py index f8e0ced..493887f 100644 --- a/labbot/addons/merge-stable.py +++ b/labbot/addons/merge-stable.py @@ -41,7 +41,7 @@ async def issue_update_hook(event, gl, *args, **kwargs): if branches: branch_str = ", ".join(branches.keys()) - log.debug(f"`{branch_str}` are ready to be merged into stable") + log.debug(f"`{branch_str}`({event.project_id}) are ready to be merged into stable") merge_url = f"/projects/{event.project_id}/merge_requests" for branch, merge in branches.items(): |