CVS commit: pkgsrc/pkgtools/pkg_install/files

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Aug 26 22:37:19 UTC 2024

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

Log Message:
pkg_install: update to 20240826

Fix previous: Only check REQUIRES after dependencies are installed.

(My testing seems to only have happened for updates.)


To generate a diff of this commit:
cvs rdiff -u -r1.123 -r1.124 pkgsrc/pkgtools/pkg_install/files/add/perform.c
cvs rdiff -u -r1.194 -r1.195 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.123 pkgsrc/pkgtools/pkg_install/files/add/perform.c:1.124
--- pkgsrc/pkgtools/pkg_install/files/add/perform.c:1.123       Sun Aug 25 06:08:00 2024
+++ pkgsrc/pkgtools/pkg_install/files/add/perform.c     Mon Aug 26 22:37:19 2024
@@ -1,4 +1,4 @@
-/*     $NetBSD: perform.c,v 1.123 2024/08/25 06:08:00 wiz Exp $        */
+/*     $NetBSD: perform.c,v 1.124 2024/08/26 22:37:19 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.123 2024/08/25 06:08:00 wiz Exp $");
+__RCSID("$NetBSD: perform.c,v 1.124 2024/08/26 22:37:19 wiz Exp $");
 
 /*-
  * Copyright (c) 2003 Grant Beattie <grant%NetBSD.org@localhost>
@@ -897,7 +897,7 @@ check_platform(struct pkg_task *pkg)
        const char *effective_os_version;
        int fatal;
 
-        if (OverrideOpsys != NULL && OverrideOSVersion != NULL) {
+       if (OverrideOpsys != NULL && OverrideOSVersion != NULL) {
                effective_opsys = OverrideOpsys;
                effective_os_version = OverrideOSVersion;
        } else {
@@ -1548,9 +1548,6 @@ pkg_do(const char *pkgpath, int mark_aut
        if (check_implicit_conflict(pkg))
                goto clean_memory;
 
-       if (check_requires(pkg))
-               goto clean_memory;
-
        if (pkg->other_version != NULL) {
                /*
                 * Replacing an existing package.
@@ -1572,15 +1569,21 @@ pkg_do(const char *pkgpath, int mark_aut
 
                if (check_dependencies(pkg))
                        goto nuke_pkgdb;
+
+               if (check_requires(pkg))
+                       goto nuke_pkgdb;
        } else {
                /*
                 * Normal installation.
                 * Install/update dependencies first and
                 * write the current package to disk afterwards.
-                */ 
+                */
                if (check_dependencies(pkg))
                        goto clean_memory;
 
+               if (check_requires(pkg))
+                       goto clean_memory;
+
                if (write_meta_data(pkg))
                        goto nuke_pkgdb;
        }

Index: pkgsrc/pkgtools/pkg_install/files/lib/version.h
diff -u pkgsrc/pkgtools/pkg_install/files/lib/version.h:1.194 pkgsrc/pkgtools/pkg_install/files/lib/version.h:1.195
--- pkgsrc/pkgtools/pkg_install/files/lib/version.h:1.194       Sun Aug 25 06:08:01 2024
+++ pkgsrc/pkgtools/pkg_install/files/lib/version.h     Mon Aug 26 22:37:19 2024
@@ -1,4 +1,4 @@
-/*     $NetBSD: version.h,v 1.194 2024/08/25 06:08:01 wiz Exp $        */
+/*     $NetBSD: version.h,v 1.195 2024/08/26 22:37:19 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 20240821
+#define PKGTOOLS_VERSION 20240826
 
 #endif /* _INST_LIB_VERSION_H_ */