diff options
| -rw-r--r-- | guix-qa-frontpage/manage-patch-branches.scm | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/guix-qa-frontpage/manage-patch-branches.scm b/guix-qa-frontpage/manage-patch-branches.scm index 816ba62..ec8d75c 100644 --- a/guix-qa-frontpage/manage-patch-branches.scm +++ b/guix-qa-frontpage/manage-patch-branches.scm @@ -418,7 +418,9 @@ (let ((base-commit (assq-ref (get-issue-branch-base-and-target-refs issue-number) - 'base))) + 'base)) + (branch (patchwork-series->branch + (assq-ref all-patchwork-series issue-number)))) (with-exception-handler (lambda (exn) (if (and (guix-data-service-error? exn) @@ -439,28 +441,27 @@ (begin (simple-format (current-error-port) - "warning: exception when fetching revision details: ~A\n" - exn) + "warning: exception when fetching revision details (branch: ~A, base-commit: ~A): ~A\n" + exn + branch + base-commit) #f))) (lambda () - (let ((branch (patchwork-series->branch - (assq-ref all-patchwork-series issue-number)))) - (let ((derivation-change-count - (get-changes-compared-to-branch branch - base-commit))) - (if (> derivation-change-count 10000) - (begin - (simple-format - (current-error-port) - "Removing ~A, ~A derivation changes between base (~A) and latest ~A revision (~A)\n" - issue-number - derivation-change-count - base-commit - branch - (get-latest-processed-branch-revision* branch)) - #t) - #f)) - #f)) + (let ((derivation-change-count + (get-changes-compared-to-branch branch + base-commit))) + (if (> derivation-change-count 10000) + (begin + (simple-format + (current-error-port) + "Removing ~A, ~A derivation changes between base (~A) and latest ~A revision (~A)\n" + issue-number + derivation-change-count + base-commit + branch + (get-latest-processed-branch-revision* branch)) + #t) + #f))) #:unwind? #t))) (with-bare-git-repository |