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

Modify conflict check to avoid matching packages with the same name prefix 

(e.g. "teTeX" and "teTeX-share"). Patch is based on a suggestion by
Hubert Feyrer, fixes PR pkg/8219.
This commit is contained in:
tron 1999-08-19 07:17:35 +00:00
parent f33ac29caa
commit dffe3016d3
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,11 +1,11 @@
/* $NetBSD: perform.c,v 1.31 1999/06/15 06:32:00 cgd Exp $ */ /* $NetBSD: perform.c,v 1.32 1999/08/19 07:17:35 tron Exp $ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #ifndef lint
#if 0 #if 0
static const char *rcsid = "from FreeBSD Id: perform.c,v 1.44 1997/10/13 15:03:46 jkh Exp"; static const char *rcsid = "from FreeBSD Id: perform.c,v 1.44 1997/10/13 15:03:46 jkh Exp";
#else #else
__RCSID("$NetBSD: perform.c,v 1.31 1999/06/15 06:32:00 cgd Exp $"); __RCSID("$NetBSD: perform.c,v 1.32 1999/08/19 07:17:35 tron Exp $");
#endif #endif
#endif #endif
@ -271,10 +271,12 @@ pkg_do(char *pkg)
char installed[FILENAME_MAX]; char installed[FILENAME_MAX];
char *s; char *s;
if ((s=strrchr(PkgName, '-')) != NULL){ if ((s = strrchr(PkgName, '-')) != NULL){
strcpy(buf, PkgName); int l;
buf[s-PkgName+1]='*';
buf[s-PkgName+2]='\0'; l = s-PkgName+1;
memcpy(buf, PkgName, l);
strcpy(&buf[l],"[0-9]*");
if (findmatchingname(dbdir, buf, check_if_installed, installed) > 0) { if (findmatchingname(dbdir, buf, check_if_installed, installed) > 0) {
warnx("other version '%s' already installed", installed); warnx("other version '%s' already installed", installed);