Fix not deleting some patch branches

When the patches were for a non-master branch.

1 files changed, 34 insertions, 36 deletions

diff --git a/guix-qa-frontpage/manage-patch-branches.scm b/guix-qa-frontpage/manage-patch-branches.scm
index c11b33a..1ffd6af 100644
--- a/guix-qa-frontpage/manage-patch-branches.scm
+++ b/guix-qa-frontpage/manage-patch-branches.scm
@@ -415,37 +415,37 @@
                           issue-number)
                          #t)
                        #f)
-                   (if (string=? "master"
-                                 (patchwork-series->branch
-                                  (assq-ref all-patchwork-series issue-number)))
-                       (let ((base-commit
-                              (assq-ref
-                               (get-issue-branch-base-and-target-refs issue-number)
-                               'base)))
-                         (with-exception-handler
-                             (lambda (exn)
-                               (if (and (guix-data-service-error? exn)
-                                        (and=>
-                                         (dig
-                                          (guix-data-service-error-response-body exn)
-                                          "query_parameters" "base_commit"
-                                          "invalid")
-                                         (lambda (invalid)
-                                           (string=? invalid "unknown commit"))))
-                                   (begin
-                                     (simple-format
-                                      (current-error-port)
-                                      "Removing ~A, base revision (~A) gone\n"
-                                      issue-number
-                                      base-commit)
-                                     #t)
-                                   (begin
-                                     (simple-format
-                                      (current-error-port)
-                                      "warning: exception when fetching revision details: ~A\n"
-                                      exn)
-                                     #f)))
-                           (lambda ()
+                   (let ((base-commit
+                          (assq-ref
+                           (get-issue-branch-base-and-target-refs issue-number)
+                           'base)))
+                     (with-exception-handler
+                         (lambda (exn)
+                           (if (and (guix-data-service-error? exn)
+                                    (and=>
+                                     (dig
+                                      (guix-data-service-error-response-body exn)
+                                      "query_parameters" "base_commit"
+                                      "invalid")
+                                     (lambda (invalid)
+                                       (string=? invalid "unknown commit"))))
+                               (begin
+                                 (simple-format
+                                  (current-error-port)
+                                  "Removing ~A, base revision (~A) gone\n"
+                                  issue-number
+                                  base-commit)
+                                 #t)
+                               (begin
+                                 (simple-format
+                                  (current-error-port)
+                                  "warning: exception when fetching revision details: ~A\n"
+                                  exn)
+                                 #f)))
+                       (lambda ()
+                         (if (string=? "master"
+                                       (patchwork-series->branch
+                                        (assq-ref all-patchwork-series issue-number)))
                              (let ((derivation-change-count
                                     (get-changes-compared-to-master base-commit)))
                                (if (> derivation-change-count 10000)
@@ -458,11 +458,9 @@
                                       base-commit
                                       latest-master-revision)
                                      #t)
-                                   #f)))
-                           #:unwind? #t))
-                       ;; Don't do the following checks on changes for
-                       ;; non-master branches.
-                       #f))
+                                   #f))
+                             #f))
+                       #:unwind? #t)))
 
            (with-bare-git-repository
             (lambda ()