Module Name: src
Committed By: wiz
Date: Mon Aug 26 22:41:39 UTC 2024
Modified Files:
src/external/bsd/pkg_install/dist/add: perform.c
src/external/bsd/pkg_install/dist/lib: version.h
Log Message:
merge pkg_install-20240826
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/pkg_install/dist/add/perform.c
cvs rdiff -u -r1.22 -r1.23 src/external/bsd/pkg_install/dist/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: src/external/bsd/pkg_install/dist/add/perform.c
diff -u src/external/bsd/pkg_install/dist/add/perform.c:1.12 src/external/bsd/pkg_install/dist/add/perform.c:1.13
--- src/external/bsd/pkg_install/dist/add/perform.c:1.12 Sun Aug 25 06:49:40 2024
+++ src/external/bsd/pkg_install/dist/add/perform.c Mon Aug 26 22:41:39 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: perform.c,v 1.12 2024/08/25 06:49:40 wiz Exp $ */
+/* $NetBSD: perform.c,v 1.13 2024/08/26 22:41:39 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.12 2024/08/25 06:49:40 wiz Exp $");
+__RCSID("$NetBSD: perform.c,v 1.13 2024/08/26 22:41:39 wiz Exp $");
/*-
* Copyright (c) 2003 Grant Beattie <gr...@netbsd.org>
@@ -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: src/external/bsd/pkg_install/dist/lib/version.h
diff -u src/external/bsd/pkg_install/dist/lib/version.h:1.22 src/external/bsd/pkg_install/dist/lib/version.h:1.23
--- src/external/bsd/pkg_install/dist/lib/version.h:1.22 Sun Aug 25 06:49:40 2024
+++ src/external/bsd/pkg_install/dist/lib/version.h Mon Aug 26 22:41:39 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: version.h,v 1.22 2024/08/25 06:49:40 wiz Exp $ */
+/* $NetBSD: version.h,v 1.23 2024/08/26 22:41:39 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_ */
