Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

In the "quick depends pre-check" don't only try to replace anything

Browse Source 
after a "-" with the "more liberal pattern", but also anything after
any pkg wildcard.

That way if someone has teTeX-share-1.0 installed and pkg_adds
teTeX-1.0.7 (which wants teTeX-share>1.0.2), it will be caught.

XXX This "quick depends pre-check" would be nice to be done in
    bsd.pkg.mk as well
This commit is contained in:
hubertf 2000-03-31 22:12:56 +00:00
parent af00111d22
commit 404096ac77
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.sbin/pkg_install/add/perform.c
View File

@ -1,11 +1,11 @@
/* $NetBSD: perform.c,v 1.46 2000/03/19 17:24:27 hubertf Exp $ */
/* $NetBSD: perform.c,v 1.47 2000/03/31 22:12:56 hubertf Exp $ */
#include <sys/cdefs.h>
#ifndef lint
#if 0
static const char *rcsid = "from FreeBSD Id: perform.c,v 1.44 1997/10/13 15:03:46 jkh Exp";
#else
__RCSID("$NetBSD: perform.c,v 1.46 2000/03/19 17:24:27 hubertf Exp $");
__RCSID("$NetBSD: perform.c,v 1.47 2000/03/31 22:12:56 hubertf Exp $");
#endif
#endif
@ -364,7 +364,7 @@ pkg_do(char *pkg)
*/
char *s;
if ((s = strrchr(p->name, '-')) != NULL) {
if (((s = strrchr(p->name, '-')) != NULL) || (s = strpbrk(p->name, "<>[]?*{") != NULL)) {
char buf[FILENAME_MAX];
(void) snprintf(buf, sizeof(buf), "%.*s[0-9]*",