pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/pkgtools/pbulk

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Tue May 16 12:12:19 UTC 2023

Modified Files:
        pkgsrc/pkgtools/pbulk: Makefile
        pkgsrc/pkgtools/pbulk/files/pbulk/scripts: create-report-html.awk

Log Message:
pbulk-0.71: Report culprit in html report for indirect-prefailed too.


To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 pkgsrc/pkgtools/pbulk/Makefile
cvs rdiff -u -r1.15 -r1.16 \
    pkgsrc/pkgtools/pbulk/files/pbulk/scripts/create-report-html.awk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: pkgsrc/pkgtools/pbulk/Makefile
diff -u pkgsrc/pkgtools/pbulk/Makefile:1.89 pkgsrc/pkgtools/pbulk/Makefile:1.90
--- pkgsrc/pkgtools/pbulk/Makefile:1.89 Mon Dec  6 11:21:19 2021
+++ pkgsrc/pkgtools/pbulk/Makefile      Tue May 16 12:12:19 2023
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.89 2021/12/06 11:21:19 wiz Exp $
+# $NetBSD: Makefile,v 1.90 2023/05/16 12:12:19 riastradh Exp $
 
-PKGNAME=       pbulk-0.70
+PKGNAME=       pbulk-0.71
 COMMENT=       Modular bulk build framework
 
 .include "../../pkgtools/pbulk/Makefile.common"

Index: pkgsrc/pkgtools/pbulk/files/pbulk/scripts/create-report-html.awk
diff -u pkgsrc/pkgtools/pbulk/files/pbulk/scripts/create-report-html.awk:1.15 pkgsrc/pkgtools/pbulk/files/pbulk/scripts/create-report-html.awk:1.16
--- pkgsrc/pkgtools/pbulk/files/pbulk/scripts/create-report-html.awk:1.15       Wed May 14 14:45:26 2014
+++ pkgsrc/pkgtools/pbulk/files/pbulk/scripts/create-report-html.awk    Tue May 16 12:12:19 2023
@@ -1,5 +1,5 @@
 #!@AWK@ -f
-# $NetBSD: create-report-html.awk,v 1.15 2014/05/14 14:45:26 abs Exp $
+# $NetBSD: create-report-html.awk,v 1.16 2023/05/16 12:12:19 riastradh Exp $
 #
 # Copyright (c) 2007, 2008 Joerg Sonnenberger <joerg%NetBSD.org@localhost>.
 # All rights reserved.
@@ -159,7 +159,8 @@ function print_failed(PKGNAME, cmd, has_
        print_failed_log_line(PKGNAME, "clean", has_clean)
        print_failed_log_line(PKGNAME, "deinstall", has_deinstall)
        print "</tr>" > html_report
-       if (status[PKGNAME] == "indirect-failed") {
+       if (status[PKGNAME] == "indirect-failed" ||
+           status[PKGNAME] == "indirect-prefailed") {
                print "<tr class=\"" status[PKGNAME] "\">" > html_report
                printf "<td>&nbsp;</td>" > html_report
                printf "<td colspan=\"13\"> Failed: " > html_report
@@ -183,9 +184,11 @@ function compute_direct_failure(CUR, dep
        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>" > html_report
Home | Main Index | Thread Index | Old Index