From 269eef0a93025bc515a7f050e5050dba95a24e8d Mon Sep 17 00:00:00 2001 From: Taylor R Campbell Date: Mon, 15 May 2023 16:09:13 +0000 Subject: [PATCH] pbulk-0.71: Report culprit in html report for indirect-prefailed too. --- pkgtools/pbulk/Makefile | 2 +- .../files/pbulk/scripts/create-report-html.awk | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgtools/pbulk/Makefile b/pkgtools/pbulk/Makefile index 11a4d9de8ff6..715feef8cb12 100644 --- a/pkgtools/pbulk/Makefile +++ b/pkgtools/pbulk/Makefile @@ -1,6 +1,6 @@ # $NetBSD: Makefile,v 1.89 2021/12/06 11:21:19 wiz Exp $ -PKGNAME= pbulk-0.70 +PKGNAME= pbulk-0.71 COMMENT= Modular bulk build framework .include "../../pkgtools/pbulk/Makefile.common" diff --git a/pkgtools/pbulk/files/pbulk/scripts/create-report-html.awk b/pkgtools/pbulk/files/pbulk/scripts/create-report-html.awk index 460b140ce8d5..e6720b187db4 100755 --- a/pkgtools/pbulk/files/pbulk/scripts/create-report-html.awk +++ b/pkgtools/pbulk/files/pbulk/scripts/create-report-html.awk @@ -159,7 +159,8 @@ function print_failed(PKGNAME, cmd, has_pre_clean, has_depends, print_failed_log_line(PKGNAME, "clean", has_clean) print_failed_log_line(PKGNAME, "deinstall", has_deinstall) print "" > html_report - if (status[PKGNAME] == "indirect-failed") { + if (status[PKGNAME] == "indirect-failed" || + status[PKGNAME] == "indirect-prefailed") { print "" > html_report printf " " > html_report printf " Failed: " > html_report @@ -183,9 +184,11 @@ function compute_direct_failure(CUR, dep, cur_dep, cur_depends, found, i) { split(depends[CUR], cur_depends, "[ \t]+") for (dep in cur_depends) { cur_dep = cur_depends[dep] - if (status[cur_dep] == "failed") { + if (status[cur_dep] == "failed" || + status[cur_dep] == "prefailed") { failed_pkgs[CUR] = failed_pkgs[CUR] " " cur_dep - } else if (status[cur_dep] == "indirect-failed") { + } else if (status[cur_dep] == "indirect-failed" || + status[cur_dep] == "indirect-prefailed") { compute_direct_failure(cur_dep) failed_pkgs[CUR] = failed_pkgs[cur_dep] " " failed_pkgs[CUR] } @@ -260,8 +263,10 @@ BEGIN { else if (status[pkg] == "indirect-failed") { compute_direct_failure(pkg) ++pkgs_indirect_failed - } else if (status[pkg] == "indirect-prefailed") + } else if (status[pkg] == "indirect-prefailed") { + compute_direct_failure(pkg) ++pkgs_indirect_prefailed + } } print "" > html_report