Mon Apr 6 14:34:15 2009 UTC ()
pkg_install-20090406:
Remove premature return that broke dependency tracking for pkg_add -u.
Fixes PR 41143.


(joerg)
diff -r1.84 -r1.85 pkgsrc/pkgtools/pkg_install/files/add/perform.c
diff -r1.120 -r1.121 pkgsrc/pkgtools/pkg_install/files/lib/version.h

cvs diff -r1.84 -r1.85 pkgsrc/pkgtools/pkg_install/files/add/perform.c (expand / switch to context diff)
--- pkgsrc/pkgtools/pkg_install/files/add/perform.c 2009/03/08 14:50:36 1.84
+++ pkgsrc/pkgtools/pkg_install/files/add/perform.c 2009/04/06 14:34:15 1.85
@@ -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>
@@ -762,9 +762,6 @@
 
 	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);

cvs diff -r1.120 -r1.121 pkgsrc/pkgtools/pkg_install/files/lib/version.h (expand / switch to context diff)
--- pkgsrc/pkgtools/pkg_install/files/lib/version.h 2009/03/26 14:32:39 1.120
+++ pkgsrc/pkgtools/pkg_install/files/lib/version.h 2009/04/06 14:34:15 1.121
@@ -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_ */