[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install/files/lib When looking for a pack...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/36bb4f41e54d
branches:  trunk
changeset: 532494:36bb4f41e54d
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Aug 21 07:11:42 2007 +0000

description:
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:

 pkgtools/pkg_install/files/lib/file.c    |  6 +++---
 pkgtools/pkg_install/files/lib/version.h |  4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (44 lines):

diff -r 182e32b8f398 -r 36bb4f41e54d pkgtools/pkg_install/files/lib/file.c
--- a/pkgtools/pkg_install/files/lib/file.c     Tue Aug 21 06:37:41 2007 +0000
+++ b/pkgtools/pkg_install/files/lib/file.c     Tue Aug 21 07:11:42 2007 +0000
@@ -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 @@
                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 -r 182e32b8f398 -r 36bb4f41e54d pkgtools/pkg_install/files/lib/version.h
--- a/pkgtools/pkg_install/files/lib/version.h  Tue Aug 21 06:37:41 2007 +0000
+++ b/pkgtools/pkg_install/files/lib/version.h  Tue Aug 21 07:11:42 2007 +0000
@@ -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_ */