diff options
| author | joerg <joerg> | 2007-11-08 23:24:56 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2007-11-08 23:24:56 +0000 |
| commit | b752d37a8f4da8fdd890b8242b9337f936366985 (patch) | |
| tree | 6971343df89dff21bab2f0f2e650be811f58c3b2 /pkgtools | |
| parent | 9e6409c64baa2d14c9b3d923b91841ce7031d151 (diff) | |
| download | pkgsrc-b752d37a8f4da8fdd890b8242b9337f936366985.tar.gz | |
Don't use the build time version to find packages, we want to pick up
the newest version. Bump version to 20071109.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkg_install/files/add/perform.c | 23 | ||||
| -rw-r--r-- | pkgtools/pkg_install/files/lib/version.h | 4 |
2 files changed, 7 insertions, 20 deletions
diff --git a/pkgtools/pkg_install/files/add/perform.c b/pkgtools/pkg_install/files/add/perform.c index 76243074801..9ca53c9ddb4 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.65 2007/11/01 23:08:29 rillig Exp $ */ +/* $NetBSD: perform.c,v 1.66 2007/11/08 23:24:56 joerg Exp $ */ #if HAVE_CONFIG_H #include "config.h" @@ -14,7 +14,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.65 2007/11/01 23:08:29 rillig Exp $"); +__RCSID("$NetBSD: perform.c,v 1.66 2007/11/08 23:24:56 joerg Exp $"); #endif #endif @@ -386,7 +386,6 @@ pkg_do(const char *pkg, lpkg_head_t *pkgs) char *buildinfo[BI_ENUM_COUNT]; int replacing = 0; char dbdir[MaxPathSize]; - const char *exact; const char *tmppkg; FILE *cfile; int errc, err_prescan; @@ -761,17 +760,11 @@ pkg_do(const char *pkg, lpkg_head_t *pkgs) /* Now check the packing list for dependencies */ - for (exact = NULL, p = Plist.head; p; p = p->next) { + for (p = Plist.head; p; p = p->next) { char *best_installed; - if (p->type == PLIST_BLDDEP) { - exact = p->name; - continue; - } - if (p->type != PLIST_PKGDEP) { - exact = NULL; + if (p->type != PLIST_PKGDEP) continue; - } if (Verbose) printf("Package `%s' depends on `%s'.\n", PkgName, p->name); @@ -789,13 +782,7 @@ pkg_do(const char *pkg, lpkg_head_t *pkgs) int done = 0; int errc0 = 0; - if (exact != NULL) { - /* first try the exact name, from the @blddep */ - done = installprereq(exact, &errc0, (Replace > 1) ? 2 : 0); - } - if (!done) { - done = installprereq(p->name, &errc0, (Replace > 1) ? 2 : 0); - } + done = installprereq(p->name, &errc0, (Replace > 1) ? 2 : 0); if (!done && !Force) { errc += errc0; } diff --git a/pkgtools/pkg_install/files/lib/version.h b/pkgtools/pkg_install/files/lib/version.h index 8b19cf13197..c1e89260f41 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.85 2007/11/08 19:39:42 joerg Exp $ */ +/* $NetBSD: version.h,v 1.86 2007/11/08 23:24:56 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 "20071108" +#define PKGTOOLS_VERSION "20071109" #endif /* _INST_LIB_VERSION_H_ */ |