diff options
| author | seb <seb> | 2003-04-23 10:27:39 +0000 |
|---|---|---|
| committer | seb <seb> | 2003-04-23 10:27:39 +0000 |
| commit | 0dfef040caad457cd9b8dc8ba07a2b3c272bb104 (patch) | |
| tree | bcfc6d33c80368df657ee200c281260753cd0db2 /pkgtools | |
| parent | 60e9807a4fa52ef156e0dba6a064d2854bbee868 (diff) | |
| download | pkgsrc-0dfef040caad457cd9b8dc8ba07a2b3c272bb104.tar.gz | |
Update to version 20030423 via patch from src/usr.sbin/pkg_install.
>Log Message:
>pkg_add fix:
>When doing quick pre-check if any conflicting dependencies are installed
>and a dependency is not found installed do not try to search for a wildcarded
>(-[0-9]* suffix) package if the dependency was already wildcarded.
>
>This prevent something like 'p5-Net-DNS-0.33' reported as an already
>installed version of 'p5-Net-[0-9]*' as a dependency.
>Before this fix 'p5-Net-[0-[0-9]*' would have been incorrectly searched for.
>
>Reviewed by hubertf@.
>
>Bump PKGTOOLS_VERSION to 20030423.
>
>
>To generate a diff of this commit:
>cvs rdiff -r1.81 -r1.82 src/usr.sbin/pkg_install/add/perform.c
>cvs rdiff -r1.26 -r1.27 src/usr.sbin/pkg_install/lib/version.h
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkg_install/files/add/perform.c | 9 | ||||
| -rw-r--r-- | pkgtools/pkg_install/files/lib/version.h | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/pkgtools/pkg_install/files/add/perform.c b/pkgtools/pkg_install/files/add/perform.c index 33f4c36f631..614d897170b 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.6 2003/04/17 13:50:54 grant Exp $ */ +/* $NetBSD: perform.c,v 1.7 2003/04/23 10:27:39 seb Exp $ */ #if 0 #include <sys/cdefs.h> @@ -6,7 +6,7 @@ #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.6 2003/04/17 13:50:54 grant Exp $"); +__RCSID("$NetBSD: perform.c,v 1.7 2003/04/23 10:27:39 seb Exp $"); #endif #endif #endif @@ -506,6 +506,11 @@ ignore_upgrade_depends_check: if ((s = strpbrk(p->name, "<>")) != NULL) { skip = 0; + } else if (((s = strstr(p->name, "-[0-9]*")) != NULL) && + (*(s + sizeof("-[0-9]*") - 1) == '\0')) { + /* -[0-9]* already present so no need to */ + /* add it a second time */ + skip = -1; } else if ((s = strrchr(p->name, '-')) != NULL) { skip = 1; } diff --git a/pkgtools/pkg_install/files/lib/version.h b/pkgtools/pkg_install/files/lib/version.h index aa94f308392..eb23731d242 100644 --- a/pkgtools/pkg_install/files/lib/version.h +++ b/pkgtools/pkg_install/files/lib/version.h @@ -1,4 +1,4 @@ -/* $NetBSD: version.h,v 1.8 2003/04/17 14:00:55 grant Exp $ */ +/* $NetBSD: version.h,v 1.9 2003/04/23 10:27:40 seb Exp $ */ /* * Copyright (c) 2001 Thomas Klausner. All rights reserved. @@ -33,6 +33,6 @@ #ifndef _INST_LIB_VERSION_H_ #define _INST_LIB_VERSION_H_ -#define PKGTOOLS_VERSION "20030417" +#define PKGTOOLS_VERSION "20030423" #endif /* _INST_LIB_VERSION_H_ */ |