diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2000-03-27 17:15:01 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2000-03-27 17:15:01 +0000 |
| commit | 0b47be7e2d7bf34795c9ae58d986cefaba5715aa (patch) | |
| tree | f2e45a7b0b6b87676b256b415c9aaf18a8df1da7 /usr.sbin | |
| parent | 1d3ecbdd0bc056ae1f8e344d820e64225f9a8cf1 (diff) | |
Add and document option no-default-conflict.
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/pkg_install/add/perform.c | 12 | ||||
| -rw-r--r-- | usr.sbin/pkg_install/create/pkg_create.1 | 14 |
2 files changed, 20 insertions, 6 deletions
diff --git a/usr.sbin/pkg_install/add/perform.c b/usr.sbin/pkg_install/add/perform.c index 6ba0b7e1780..c3fd94a9caf 100644 --- a/usr.sbin/pkg_install/add/perform.c +++ b/usr.sbin/pkg_install/add/perform.c @@ -1,7 +1,7 @@ -/* $OpenBSD: perform.c,v 1.11 1999/11/03 17:23:48 espie Exp $ */ +/* $OpenBSD: perform.c,v 1.12 2000/03/27 17:14:59 espie Exp $ */ #ifndef lint -static const char *rcsid = "$OpenBSD: perform.c,v 1.11 1999/11/03 17:23:48 espie Exp $"; +static const char *rcsid = "$OpenBSD: perform.c,v 1.12 2000/03/27 17:14:59 espie Exp $"; #endif /* @@ -268,8 +268,12 @@ pkg_do(char *pkg) if (findmatchingname(dbdir, buf, check_if_installed, installed)) { warnx("other version '%s' already installed", installed); - code = 1; - goto success; /* close enough for government work */ + if (find_plist_option(&Plist, "no-default-conflict") != NULL) { + warnx("proceeding with installation anyway"); + } else { + code = 1; + goto success; /* close enough for government work */ + } } } } diff --git a/usr.sbin/pkg_install/create/pkg_create.1 b/usr.sbin/pkg_install/create/pkg_create.1 index 52b3e40b242..9bb11d8641b 100644 --- a/usr.sbin/pkg_install/create/pkg_create.1 +++ b/usr.sbin/pkg_install/create/pkg_create.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: pkg_create.1,v 1.13 2000/03/27 17:09:02 espie Exp $ +.\" $OpenBSD: pkg_create.1,v 1.14 2000/03/27 17:15:00 espie Exp $ .\" .\" FreeBSD install - a package for the installation and maintainance .\" of non-core utilities. @@ -437,10 +437,20 @@ package must be installed if .Ar pkgname package gets installed cause they install the same files and thus conflict. +.Ar pkgcflname +may use +.Xr fnmatch 3 +wildcards. .It Cm @option Ar name Effects vary depending on .Ar name . -No options are documented yet. +Some options are not documented yet. +.Bl -tag -width indent +.It Ar no-default-conflict +By default, a package conflicts with other versions of the same package. +With this option, the older package version will still be noticed, but the +installation will proceed anyway. +.El .El .Sh SEE ALSO .Xr pkg_add 1 , |