diff options
| author | minskim <minskim> | 2005-05-29 19:20:53 +0000 |
|---|---|---|
| committer | minskim <minskim> | 2005-05-29 19:20:53 +0000 |
| commit | b81a351fa86f4b554b3481252c71cd7500a41bf2 (patch) | |
| tree | 52a4506dc0cbebbf3883866d88fef664bc434517 /pkgtools/pkg_install | |
| parent | 607c5b68c4ce305383e366004fa3b212015c08d8 (diff) | |
| download | pkgsrc-b81a351fa86f4b554b3481252c71cd7500a41bf2.tar.gz | |
Sync with 20050529 in src/.
If a pattern does not have any suffix, assume that it matches both
".tbz" and ".tgz". This allows to install binary package dependencies
that are not exact matches, but satisfy requirements.
Diffstat (limited to 'pkgtools/pkg_install')
| -rw-r--r-- | pkgtools/pkg_install/files/lib/str.c | 6 | ||||
| -rw-r--r-- | pkgtools/pkg_install/files/lib/version.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgtools/pkg_install/files/lib/str.c b/pkgtools/pkg_install/files/lib/str.c index 82d886ff063..b221e316466 100644 --- a/pkgtools/pkg_install/files/lib/str.c +++ b/pkgtools/pkg_install/files/lib/str.c @@ -1,4 +1,4 @@ -/* $NetBSD: str.c,v 1.10 2004/12/29 12:16:56 agc Exp $ */ +/* $NetBSD: str.c,v 1.11 2005/05/29 19:20:53 minskim Exp $ */ #if HAVE_CONFIG_H #include "config.h" @@ -11,7 +11,7 @@ #if 0 static const char *rcsid = "Id: str.c,v 1.5 1997/10/08 07:48:21 charnier Exp"; #else -__RCSID("$NetBSD: str.c,v 1.10 2004/12/29 12:16:56 agc Exp $"); +__RCSID("$NetBSD: str.c,v 1.11 2005/05/29 19:20:53 minskim Exp $"); #endif #endif @@ -485,7 +485,7 @@ findmatchingname(const char *dir, const char *pattern, matchfn match, void *data * each is a different pattern class (e.g. dewey and * character class (.t[bg]z)) */ if (pmatch(tmp_pattern, tmp_file) - && pmatch(pat_sfx, file_sfx)) { + && (pat_sfx[0] == '\0' || pmatch(pat_sfx, file_sfx))) { if (match) { match(dp->d_name, data); /* return value ignored for now */ diff --git a/pkgtools/pkg_install/files/lib/version.h b/pkgtools/pkg_install/files/lib/version.h index 2deb1d1f75d..c14716ea1b7 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.43 2005/05/28 02:50:46 dmcmahill Exp $ */ +/* $NetBSD: version.h,v 1.44 2005/05/29 19:20:53 minskim 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 "20050527" +#define PKGTOOLS_VERSION "20050529" #endif /* _INST_LIB_VERSION_H_ */ |