diff options
| author | joerg <joerg@pkgsrc.org> | 2009-04-06 14:34:15 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2009-04-06 14:34:15 +0000 |
| commit | 3238d0ace21d3f7bd9c5a1fdead68ac131d38634 (patch) | |
| tree | 4042bdd2cba0a3e209995450e66adccd5b471229 /pkgtools | |
| parent | d4f61b3a35a1f3cd29b8c52f0d360f807231ca8f (diff) | |
| download | pkgsrc-3238d0ace21d3f7bd9c5a1fdead68ac131d38634.tar.gz | |
pkg_install-20090406:
Remove premature return that broke dependency tracking for pkg_add -u.
Fixes PR 41143.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkg_install/files/add/perform.c | 7 | ||||
| -rw-r--r-- | pkgtools/pkg_install/files/lib/version.h | 4 |
2 files changed, 4 insertions, 7 deletions
diff --git a/pkgtools/pkg_install/files/add/perform.c b/pkgtools/pkg_install/files/add/perform.c index 6e776168578..58dc5770b0a 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.84 2009/03/08 14:50:36 joerg Exp $ */ +/* $NetBSD: perform.c,v 1.85 2009/04/06 14:34:15 joerg Exp $ */ #if HAVE_CONFIG_H #include "config.h" #endif @@ -6,7 +6,7 @@ #if HAVE_SYS_CDEFS_H #include <sys/cdefs.h> #endif -__RCSID("$NetBSD: perform.c,v 1.84 2009/03/08 14:50:36 joerg Exp $"); +__RCSID("$NetBSD: perform.c,v 1.85 2009/04/06 14:34:15 joerg Exp $"); /*- * Copyright (c) 2003 Grant Beattie <grant@NetBSD.org> @@ -763,9 +763,6 @@ pkg_register_depends(struct pkg_task *pkg) if (Fake) return; - if (pkg->other_version != NULL) - return; /* XXX It's using the old dependencies. */ - text = xasprintf("%s\n", pkg->pkgname); text_len = strlen(text); diff --git a/pkgtools/pkg_install/files/lib/version.h b/pkgtools/pkg_install/files/lib/version.h index 21a257cc3af..743743eff81 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.120 2009/03/26 14:32:39 joerg Exp $ */ +/* $NetBSD: version.h,v 1.121 2009/04/06 14:34:15 joerg Exp $ */ /* * Copyright (c) 2001 Thomas Klausner. All rights reserved. @@ -27,6 +27,6 @@ #ifndef _INST_LIB_VERSION_H_ #define _INST_LIB_VERSION_H_ -#define PKGTOOLS_VERSION "20090326" +#define PKGTOOLS_VERSION "20090406" #endif /* _INST_LIB_VERSION_H_ */ |