From 139385bd80cca61af7cef55653f5cb4fdb2f9bbf Mon Sep 17 00:00:00 2001 From: MarkusRost <2701034-MarkusRost@users.noreply.gitlab.com> Date: Wed, 26 May 2021 13:46:59 +0000 Subject: [PATCH] use function again --- extensions/hooks/edit_alerts.py | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/extensions/hooks/edit_alerts.py b/extensions/hooks/edit_alerts.py index c0f0252..a96582a 100644 --- a/extensions/hooks/edit_alerts.py +++ b/extensions/hooks/edit_alerts.py @@ -102,25 +102,15 @@ def edit_alerts_hook(message, metadata, context, change): check_group_requirements(change.get("tags", []), requirement.get("tags", [])) if requirement.get("categories", []): for req_cats in requirement.get("categories", []): - if req_cats.get("added", []): - for added_cats in req_cats.get("added", []): - for added_cat in added_cats: - if added_cat not in context.categories.new: - break - else: - break - else: - raise RequirementNotMet - if req_cats.get("removed", []): - for removed_cats in req_cats.get("removed", []): - for removed_cat in removed_cats: - if removed_cat not in context.categories.removed: - break - else: - break - else: - raise RequirementNotMet - break + try: + check_group_requirements(context.categories.new, reqCats.get("added", [])) + check_group_requirements(context.categories.removed, reqCats.get("removed", [])) + except RequirementNotMet: + continue + else: + break + else: + raise RequirementNotMet except RequirementNotMet: continue else: