diff options
| author | gdt <gdt> | 2010-09-14 22:26:18 +0000 |
|---|---|---|
| committer | gdt <gdt> | 2010-09-14 22:26:18 +0000 |
| commit | c2dc4dca11ac49d016be969fb8006778ab1aa804 (patch) | |
| tree | e6d5bc05bbfb426a6dcd29cada83054e7d43ed18 /pkgtools/pkg_install/files/add/perform.c | |
| parent | ac0fb6d15155a25d7babbe68b950e1e015481040 (diff) | |
| download | pkgsrc-c2dc4dca11ac49d016be969fb8006778ab1aa804.tar.gz | |
Add -D flag to pkg_install, to override the "pkg_add -U" check that
all depending packages have their dependencies satisfied by the new
package. Essentially, split off this particular behavior as a special
case of -f, so that -f works as before, unforced works as before, and
one can give -D to override exactly this check, leaving all other
checks intact.
The -D flag is in support of make replace, as the workflow for make
replace is that inter-package dependencies are sometimes violated (but
then one must replace the depending packages, which is what
pkg_rolling-replace does via the unsafe_depends flags).
Bump PKGTOOLS_VERSION.
Add missing break statement in option parsing of "pkg_add -C", riding
the version bump.
Discussed extensively on tech-pkg@ over the summer.
OK pkgsrc-pmc@.
Diffstat (limited to 'pkgtools/pkg_install/files/add/perform.c')
| -rw-r--r-- | pkgtools/pkg_install/files/add/perform.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgtools/pkg_install/files/add/perform.c b/pkgtools/pkg_install/files/add/perform.c index 3a7e1eb8587..8a1967d4bc2 100644 --- a/pkgtools/pkg_install/files/add/perform.c +++ b/pkgtools/pkg_install/files/add/perform.c @@ -1,4 +1,4 @@ -/* $NetBSD: perform.c,v 1.97 2010/06/16 23:02:48 joerg Exp $ */ +/* $NetBSD: perform.c,v 1.98 2010/09/14 22:26:18 gdt 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.97 2010/06/16 23:02:48 joerg Exp $"); +__RCSID("$NetBSD: perform.c,v 1.98 2010/09/14 22:26:18 gdt Exp $"); /*- * Copyright (c) 2003 Grant Beattie <grant@NetBSD.org> @@ -458,7 +458,7 @@ check_other_installed(struct pkg_task *pkg) continue; /* Both match, ok. */ warnx("Dependency of %s fulfilled by %s, but not by %s", iter, pkg->other_version, pkg->pkgname); - if (!Force) + if (!ForceDepending) status = -1; break; } |