CVS commit: pkgsrc/pkgtools/pkg_install/files

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Feb 19 15:19:49 UTC 2025

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

Log Message:
pkg_install: allower overriding the 'required libraries' check with -f

Bump version.


To generate a diff of this commit:
cvs rdiff -u -r1.131 -r1.132 pkgsrc/pkgtools/pkg_install/files/add/perform.c
cvs rdiff -u -r1.199 -r1.200 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.131 pkgsrc/pkgtools/pkg_install/files/add/perform.c:1.132
--- pkgsrc/pkgtools/pkg_install/files/add/perform.c:1.131       Tue Feb 18 12:55:11 2025
+++ pkgsrc/pkgtools/pkg_install/files/add/perform.c     Wed Feb 19 15:19:49 2025
@@ -1,4 +1,4 @@
-/*     $NetBSD: perform.c,v 1.131 2025/02/18 12:55:11 wiz Exp $        */
+/*     $NetBSD: perform.c,v 1.132 2025/02/19 15:19:49 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.131 2025/02/18 12:55:11 wiz Exp $");
+__RCSID("$NetBSD: perform.c,v 1.132 2025/02/19 15:19:49 wiz Exp $");
 
 /*-
  * Copyright (c) 2003 Grant Beattie <grant%NetBSD.org@localhost>
@@ -1178,6 +1178,10 @@ check_requires(struct pkg_task *pkg)
                }
        }
 
+       if (ret == 1 && Force) {
+               warnx("Required libraries are missing, but installation forced to continue");
+               ret = 0;
+       }
        return ret;
 }
 

Index: pkgsrc/pkgtools/pkg_install/files/lib/version.h
diff -u pkgsrc/pkgtools/pkg_install/files/lib/version.h:1.199 pkgsrc/pkgtools/pkg_install/files/lib/version.h:1.200
--- pkgsrc/pkgtools/pkg_install/files/lib/version.h:1.199       Tue Feb 18 21:57:32 2025
+++ pkgsrc/pkgtools/pkg_install/files/lib/version.h     Wed Feb 19 15:19:49 2025
@@ -1,4 +1,4 @@
-/*     $NetBSD: version.h,v 1.199 2025/02/18 21:57:32 wiz Exp $        */
+/*     $NetBSD: version.h,v 1.200 2025/02/19 15:19:49 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 20250218
+#define PKGTOOLS_VERSION 20250219
 
 #endif /* _INST_LIB_VERSION_H_ */