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. Bump version to 20050529.
This commit is contained in:
parent
686a5b23f6
commit
773938ed0f
@ -1,11 +1,11 @@
|
||||
/* $NetBSD: str.c,v 1.50 2004/12/29 11:35:04 agc Exp $ */
|
||||
/* $NetBSD: str.c,v 1.51 2005/05/29 19:16:18 minskim Exp $ */
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
#ifndef lint
|
||||
#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.50 2004/12/29 11:35:04 agc Exp $");
|
||||
__RCSID("$NetBSD: str.c,v 1.51 2005/05/29 19:16:18 minskim Exp $");
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@ -473,7 +473,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 */
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: version.h,v 1.65 2005/03/18 00:12:35 hubertf Exp $ */
|
||||
/* $NetBSD: version.h,v 1.66 2005/05/29 19:16:18 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 "20050318"
|
||||
#define PKGTOOLS_VERSION "20050529"
|
||||
|
||||
#endif /* _INST_LIB_VERSION_H_ */
|
||||
|
Loading…
Reference in New Issue
Block a user