diff options
| author | joerg <joerg@pkgsrc.org> | 2007-08-21 07:11:42 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2007-08-21 07:11:42 +0000 |
| commit | 361584a5be0e6bc899fbc00226256761b8e0f5a5 (patch) | |
| tree | 3c726f98c3f59749d054831a6fe7694ae9e09ee3 /pkgtools/pkg_install | |
| parent | 689c4940d08a32dc957392efb5f93653c7749ad6 (diff) | |
| download | pkgsrc-361584a5be0e6bc899fbc00226256761b8e0f5a5.tar.gz | |
When looking for a package with a wildcard pattern, don't add the
suffix. find_best_matching_file does that already and doing it twice
is actually counterproductive. Bump to 20070821.
Diffstat (limited to 'pkgtools/pkg_install')
| -rw-r--r-- | pkgtools/pkg_install/files/lib/file.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/file.c b/pkgtools/pkg_install/files/lib/file.c index 51a5b774f5b..099cb0c6895 100644 --- a/pkgtools/pkg_install/files/lib/file.c +++ b/pkgtools/pkg_install/files/lib/file.c @@ -1,4 +1,4 @@ -/* $NetBSD: file.c,v 1.21 2007/08/12 18:54:09 joerg Exp $ */ +/* $NetBSD: file.c,v 1.22 2007/08/21 07:11:42 joerg Exp $ */ #if HAVE_CONFIG_H #include "config.h" @@ -17,7 +17,7 @@ #if 0 static const char *rcsid = "from FreeBSD Id: file.c,v 1.29 1997/10/08 07:47:54 charnier Exp"; #else -__RCSID("$NetBSD: file.c,v 1.21 2007/08/12 18:54:09 joerg Exp $"); +__RCSID("$NetBSD: file.c,v 1.22 2007/08/21 07:11:42 joerg Exp $"); #endif #endif @@ -369,7 +369,7 @@ resolvepattern(const char *name) return cp; /* add version number wildcard and try */ - snprintf(tmp, sizeof(tmp), "%s-[0-9]*.t[bg]z", name); + snprintf(tmp, sizeof(tmp), "%s-[0-9]*", name); return resolvepattern1(tmp); } diff --git a/pkgtools/pkg_install/files/lib/version.h b/pkgtools/pkg_install/files/lib/version.h index 7ab27593196..026b5cb1e9d 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.78 2007/08/14 22:47:52 joerg Exp $ */ +/* $NetBSD: version.h,v 1.79 2007/08/21 07:11:42 joerg 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 "20070814" +#define PKGTOOLS_VERSION "20070821" #endif /* _INST_LIB_VERSION_H_ */ |