From e1a859fc5e7ad4cf5eb0b3fd59b5a4b49319a939 Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Thu, 16 Aug 2018 14:19:59 -0500 Subject: [PATCH] Don't fail if the regex doesn't match. --- lugito | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/lugito b/lugito index c68e3e2..930fc95 100755 --- a/lugito +++ b/lugito @@ -225,26 +225,28 @@ def commithook(): if lpname: # https://help.launchpad.net/Code/Git#Linking_to_bugs regexp = re.compile(r"lp:\s+\#\d+(?:,\s*\#\d+)*") - lpbugs = regexp.search(commitmessage.lower()).group(0).strip("lp: ").replace("#", "") - for bug in lpbugs.split(", "): - goodtask = None - lbug = lp.load("/bugs/"+str(bug).strip()) - bug = lbug - for task in bug.bug_tasks: - for rel in cursupportedrels: - if lpname + " (Ubuntu " + rel + ")" in task.bug_target_display_name: - goodtask = task - break - if not goodtask: - if lpname + " (Ubuntu)" in task.bug_target_display_name: - goodtask = task - if goodtask: - message = bugmessage - message = message.replace("LINK", website + "/" + phidquery["name"]) - message = message.replace("COMMITMESSAGE", commitmessage) - bug.newMessage(content=message) - goodtask.status = "Fix Committed" - goodtask.lp_save() + regexpsearch = regexp.search(commitmessage.lower()) + if regexpsearch: + lpbugs = regexpsearch.group(0).strip("lp: ").replace("#", "") + for bug in lpbugs.split(", "): + goodtask = None + lbug = lp.load("/bugs/"+str(bug).strip()) + bug = lbug + for task in bug.bug_tasks: + for rel in cursupportedrels: + if lpname + " (Ubuntu " + rel + ")" in task.bug_target_display_name: + goodtask = task + break + if not goodtask: + if lpname + " (Ubuntu)" in task.bug_target_display_name: + goodtask = task + if goodtask: + message = bugmessage + message = message.replace("LINK", website + "/" + phidquery["name"]) + message = message.replace("COMMITMESSAGE", commitmessage) + bug.newMessage(content=message) + goodtask.status = "Fix Committed" + goodtask.lp_save() return "OK"