CVS commit: pkgsrc/pkgtools/pbulk

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Jan 23 15:05:41 UTC 2025

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

Log Message:
pbulk: extend txt (mail) report

If there are any packages where the dependencies could not be resolved,
there is now additional section listing them.

The summary at the top is also extended to list the number of packages
broken this way.

Bump version.


To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 pkgsrc/pkgtools/pbulk/Makefile
cvs rdiff -u -r1.8 -r1.9 \
    pkgsrc/pkgtools/pbulk/files/pbulk/scripts/create-report-txt.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.93 pkgsrc/pkgtools/pbulk/Makefile:1.94
--- pkgsrc/pkgtools/pbulk/Makefile:1.93 Mon Jan 13 11:03:03 2025
+++ pkgsrc/pkgtools/pbulk/Makefile      Thu Jan 23 15:05:41 2025
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.93 2025/01/13 11:03:03 wiz Exp $
+# $NetBSD: Makefile,v 1.94 2025/01/23 15:05:41 wiz Exp $
 
-PKGNAME=       pbulk-0.74
+PKGNAME=       pbulk-0.75
 COMMENT=       Modular bulk build framework
 
 .include "../../pkgtools/pbulk/Makefile.common"

Index: pkgsrc/pkgtools/pbulk/files/pbulk/scripts/create-report-txt.awk
diff -u pkgsrc/pkgtools/pbulk/files/pbulk/scripts/create-report-txt.awk:1.8 pkgsrc/pkgtools/pbulk/files/pbulk/scripts/create-report-txt.awk:1.9
--- pkgsrc/pkgtools/pbulk/files/pbulk/scripts/create-report-txt.awk:1.8 Sat Mar  1 19:04:37 2008
+++ pkgsrc/pkgtools/pbulk/files/pbulk/scripts/create-report-txt.awk     Thu Jan 23 15:05:41 2025
@@ -1,5 +1,5 @@
 #!@AWK@ -f
-# $NetBSD: create-report-txt.awk,v 1.8 2008/03/01 19:04:37 rillig Exp $
+# $NetBSD: create-report-txt.awk,v 1.9 2025/01/23 15:05:41 wiz Exp $
 #
 # Copyright (c) 2007 Joerg Sonnenberger <joerg%NetBSD.org@localhost>.
 # All rights reserved.
@@ -58,6 +58,7 @@ BEGIN {
        pkgs_prefailed = 0
        pkgs_indirect_failed = 0
        pkgs_indirect_prefailed = 0
+       pkgs_invalid_dependencies = 0
 
        while ((getline < status_file) > 0) {
                if ($0 ~ "^PLATFORM=")
@@ -84,6 +85,8 @@ BEGIN {
                        location[cur] = substr($0, 14)
                else if ($0 ~ "^PKG_DEPTH=")
                        depth[cur] = substr($0, 11) - 1
+               else if ($0 ~ "^PKG_FAIL_REASON=")
+                       reason[cur] = substr($0, 17)
                else if ($0 ~ "^BUILD_STATUS=") {
                        status[cur] = substr($0, 14)
                }
@@ -110,8 +113,12 @@ BEGIN {
                        ++pkgs_done
                else if (status[pkg] == "failed")
                        ++pkgs_failed
-               else if (status[pkg] == "prefailed")
+               else if (status[pkg] == "prefailed") {
+                       if (reason[pkg] ~ "could not resolve dependency") {
+                               invalid_dependencies[pkgs_invalid_dependencies++] = pkg
+                       }
                        ++pkgs_prefailed
+               }
                else if (status[pkg] == "indirect-failed")
                        ++pkgs_indirect_failed
                else if (status[pkg] == "indirect-prefailed")
@@ -132,12 +139,13 @@ BEGIN {
        print "Machine readable version: " report_base_url "/meta/report.bz2" > txt_report
        print "" > txt_report
        all_pkgs = pkgs_done + pkgs_failed + pkgs_prefailed + pkgs_indirect_failed + pkgs_indirect_prefailed
-       printf "Total number of packages:      %5d\n", all_pkgs > txt_report
-       printf "  Successfully built:          %5d\n", pkgs_done > txt_report
-       printf "  Failed to build:             %5d\n", pkgs_failed > txt_report
-       printf "  Depending on failed package: %5d\n", pkgs_indirect_failed > txt_report
-       printf "  Explicitly broken or masked: %5d\n", pkgs_prefailed > txt_report
-       printf "  Depending on masked package: %5d\n", pkgs_indirect_prefailed > txt_report
+       printf "Total number of packages:          %5d\n", all_pkgs > txt_report
+       printf "  Successfully built:              %5d\n", pkgs_done > txt_report
+       printf "  Failed to build:                 %5d\n", pkgs_failed > txt_report
+       printf "  Depending on failed package:     %5d\n", pkgs_indirect_failed > txt_report
+       printf "  Explicitly broken or masked:     %5d\n", pkgs_prefailed > txt_report
+       printf "    of which invalid dependencies: %5d\n", pkgs_invalid_dependencies > txt_report
+       printf "  Depending on masked package:     %5d\n", pkgs_indirect_prefailed > txt_report
        print "" > txt_report
 
        has_top_count = 0
@@ -160,6 +168,20 @@ BEGIN {
                }
                print "" > txt_report
        }
+
+       if (pkgs_invalid_dependencies > 0) {
+               print "Packages with invalid dependencies" > txt_report
+               print "" > txt_report
+               print "Package                                      Location                      Maintainer" > txt_report
+               print "-----------------------------------------------------------------------------------------------" > txt_report
+
+               for (i = 0; i < pkgs_invalid_dependencies; i++) {
+                       p = invalid_dependencies[i]
+                       loc = location[p]
+                       printf "%- 44s %- 29s %s\n", p, loc, maintainer[p] > txt_report
+               }
+               print "" > txt_report
+       }
        print "Build failures" > txt_report
        print "" > txt_report
        print "Package                               Breaks Maintainer" > txt_report