CVS commit: pkgsrc/pkgtools/pkg_install/files

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Apr 17 21:29:35 UTC 2025

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

Log Message:
pkg_install: fix bug in format string

Addresses PR 59316 by Dr. Thomas Orgis

Bump version.


To generate a diff of this commit:
cvs rdiff -u -r1.133 -r1.134 pkgsrc/pkgtools/pkg_install/files/add/perform.c
cvs rdiff -u -r1.200 -r1.201 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.133 pkgsrc/pkgtools/pkg_install/files/add/perform.c:1.134
--- pkgsrc/pkgtools/pkg_install/files/add/perform.c:1.133       Tue Mar  4 16:00:18 2025
+++ pkgsrc/pkgtools/pkg_install/files/add/perform.c     Thu Apr 17 21:29:34 2025
@@ -1,4 +1,4 @@
-/*     $NetBSD: perform.c,v 1.133 2025/03/04 16:00:18 schmonz Exp $    */
+/*     $NetBSD: perform.c,v 1.134 2025/04/17 21:29:34 wiz 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.133 2025/03/04 16:00:18 schmonz Exp $");
+__RCSID("$NetBSD: perform.c,v 1.134 2025/04/17 21:29:34 wiz Exp $");
 
 /*-
  * Copyright (c) 2003 Grant Beattie <grant%NetBSD.org@localhost>
@@ -1078,7 +1078,7 @@ check_explicit_conflict(struct pkg_task 
 
        if (some_installed_package_conflicts_with(pkg->pkgname,
            pkg->other_version, &installed, &installed_pattern)) {
-               warnx("%s: Installed package `%s' conflicts with `%s' when trying to install `%s'.",
+               warnx("%s: Installed package `%s' conflicts with `%s'.",
                    pkg->pkgname, installed, installed_pattern);
                free(installed);
                free(installed_pattern);

Index: pkgsrc/pkgtools/pkg_install/files/lib/version.h
diff -u pkgsrc/pkgtools/pkg_install/files/lib/version.h:1.200 pkgsrc/pkgtools/pkg_install/files/lib/version.h:1.201
--- pkgsrc/pkgtools/pkg_install/files/lib/version.h:1.200       Wed Feb 19 15:19:49 2025
+++ pkgsrc/pkgtools/pkg_install/files/lib/version.h     Thu Apr 17 21:29:35 2025
@@ -1,4 +1,4 @@
-/*     $NetBSD: version.h,v 1.200 2025/02/19 15:19:49 wiz Exp $        */
+/*     $NetBSD: version.h,v 1.201 2025/04/17 21:29:35 wiz 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 20250219
+#define PKGTOOLS_VERSION 20250417
 
 #endif /* _INST_LIB_VERSION_H_ */