CVS commit: pkgsrc/pkgtools/pkg_install/files

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Fri Nov  1 11:26:46 UTC 2024

Modified Files:
        pkgsrc/pkgtools/pkg_install/files/add: perform.c
        pkgsrc/pkgtools/pkg_install/files/lib: version.h

Log Message:
pkg_add(8): Say `error', not `warning', if it's fatal.

Break some overlong lines in the source code for these messages while
here.

PR pkg/58799: earm binary packages are actually compiled for earmv4,
resulting in a fatal warning when adding packages


To generate a diff of this commit:
cvs rdiff -u -r1.125 -r1.126 pkgsrc/pkgtools/pkg_install/files/add/perform.c
cvs rdiff -u -r1.197 -r1.198 pkgsrc/pkgtools/pkg_install/files/lib/version.h

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

Modified files:

Index: pkgsrc/pkgtools/pkg_install/files/add/perform.c
diff -u pkgsrc/pkgtools/pkg_install/files/add/perform.c:1.125 pkgsrc/pkgtools/pkg_install/files/add/perform.c:1.126
--- pkgsrc/pkgtools/pkg_install/files/add/perform.c:1.125       Wed Oct 30 16:03:38 2024
+++ pkgsrc/pkgtools/pkg_install/files/add/perform.c     Fri Nov  1 11:26:46 2024
@@ -1,4 +1,4 @@
-/*     $NetBSD: perform.c,v 1.125 2024/10/30 16:03:38 jperkin Exp $    */
+/*     $NetBSD: perform.c,v 1.126 2024/11/01 11:26:46 riastradh Exp $  */
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -6,7 +6,7 @@
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: perform.c,v 1.125 2024/10/30 16:03:38 jperkin Exp $");
+__RCSID("$NetBSD: perform.c,v 1.126 2024/11/01 11:26:46 riastradh Exp $");
 
 /*-
  * Copyright (c) 2003 Grant Beattie <grant%NetBSD.org@localhost>
@@ -931,8 +931,8 @@ check_platform(struct pkg_task *pkg)
        if (fatal ||
            compatible_platform(effective_opsys, effective_os_version,
                                pkg->buildinfo[BI_OS_VERSION]) != 1) {
-               warnx("Warning: package `%s' was built for a platform:",
-                   pkg->pkgname);
+               warnx("%s: package `%s' was built for a platform:",
+                   !Force && fatal ? "Error" : "Warning", pkg->pkgname);
                warnx("%s/%s %s (pkg) vs. %s/%s %s (this host)",
                    pkg->buildinfo[BI_OPSYS],
                    pkg->buildinfo[BI_MACHINE_ARCH],
@@ -959,13 +959,15 @@ check_pkgtools_version(struct pkg_task *
        }
 
        if (strlen(val) != 8 || strspn(val, "0123456789") != 8) {
-               warnx("Warning: package `%s' contains an invalid pkg_install version",
-                   pkg->pkgname);
+               warnx("%s:"
+                   " package `%s' contains an invalid pkg_install version",
+                   Force ? "Warning" : "Error", pkg->pkgname);
                return Force ? 0 : -1;
        }
        version = atoi(val);
        if (version > PKGTOOLS_VERSION) {
-               warnx("%s: package `%s' was built with a newer pkg_install version",
+               warnx("%s:"
+                   " package `%s' was built with a newer pkg_install version",
                    Force ? "Warning" : "Error", pkg->pkgname);
                return Force ? 0 : -1;
        }

Index: pkgsrc/pkgtools/pkg_install/files/lib/version.h
diff -u pkgsrc/pkgtools/pkg_install/files/lib/version.h:1.197 pkgsrc/pkgtools/pkg_install/files/lib/version.h:1.198
--- pkgsrc/pkgtools/pkg_install/files/lib/version.h:1.197       Wed Oct 30 16:03:38 2024
+++ pkgsrc/pkgtools/pkg_install/files/lib/version.h     Fri Nov  1 11:26:46 2024
@@ -1,4 +1,4 @@
-/*     $NetBSD: version.h,v 1.197 2024/10/30 16:03:38 jperkin Exp $    */
+/*     $NetBSD: version.h,v 1.198 2024/11/01 11:26:46 riastradh Exp $  */
 
 /*
  * Copyright (c) 2001 Thomas Klausner.  All rights reserved.
@@ -27,6 +27,6 @@
 #ifndef _INST_LIB_VERSION_H_
 #define _INST_LIB_VERSION_H_
 
-#define PKGTOOLS_VERSION 20241030
+#define PKGTOOLS_VERSION 20241101
 
 #endif /* _INST_LIB_VERSION_H_ */