From fdb809da77583a400ba1b78283bb8c31b720b7e5 Mon Sep 17 00:00:00 2001 From: Sarah Jamie Lewis Date: Sat, 15 Feb 2025 15:06:31 -0800 Subject: [PATCH 1/1] Change order of CheckApplied/CheckApply Otherwise some patches can be applied excessively --- repo/requests.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/repo/requests.go b/repo/requests.go index b04b7d2..da65cc1 100644 --- a/repo/requests.go +++ b/repo/requests.go @@ -255,15 +255,15 @@ func (rm *RequestManager) LoadIssues(logpath string, loadfn func(hash string) (* patchSummary.Body = template.HTML(doc.String()) issue.PatchInfo = patchSummary - if _, err := rm.patchHandler.CheckApply(rm.RequestIssueElement(le.Hash, issue.PatchRef)); err != nil { - if _, err := rm.patchHandler.CheckApplied(rm.RequestIssueElement(le.Hash, issue.PatchRef)); err != nil { + if _, err := rm.patchHandler.CheckApplied(rm.RequestIssueElement(le.Hash, issue.PatchRef)); err != nil { + warningCallback(INFO, "This Patch Has Been Applied") + } else { + if _, err := rm.patchHandler.CheckApply(rm.RequestIssueElement(le.Hash, issue.PatchRef)); err != nil { warningCallback(WARN, "This Patch Does Not Apply To The Current Repository") } else { - warningCallback(INFO, "This Patch Has Been Applied") + warningCallback(INFO, "This Patch Can Be Applied To The Current Repository") + issue.PatchInfo.CanBeApplied = true } - } else { - warningCallback(INFO, "This Patch Can Be Applied To The Current Repository") - issue.PatchInfo.CanBeApplied = true } } -- 2.43.0