[pkgsrc/pkgsrc-2009Q1]: pkgsrc/pkgtools/pkg_install/files Pullup ticket 2732 ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f5a43dc1e123
branches:  pkgsrc-2009Q1
changeset: 556762:f5a43dc1e123
user:      spz <spz%pkgsrc.org@localhost>
date:      Sat Apr 11 17:38:48 2009 +0000

description:
Pullup ticket 2732 - requested by joerg
Bug fix

Revisions pulled up:
- pkgsrc/pkgtools/pkg_install/files/add/perform.c       1.85
- pkgsrc/pkgtools/pkg_install/files/lib/version.h       1.121

   Module Name: pkgsrc
   Committed By:        joerg
   Date:                Mon Apr  6 14:34:15 UTC 2009

   Modified Files:
        pkgsrc/pkgtools/pkg_install/files/add: perform.c
        pkgsrc/pkgtools/pkg_install/files/lib: version.h

   Log Message:
   pkg_install-20090406:
   Remove premature return that broke dependency tracking for pkg_add -u.
   Fixes PR 41143.


   To generate a diff of this commit:
   cvs rdiff -u -r1.84 -r1.85 pkgsrc/pkgtools/pkg_install/files/add/perform.c
   cvs rdiff -u -r1.120 -r1.121 pkgsrc/pkgtools/pkg_install/files/lib/version.h

diffstat:

 pkgtools/pkg_install/files/add/perform.c |  7 ++-----
 pkgtools/pkg_install/files/lib/version.h |  4 ++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diffs (45 lines):

diff -r 87cad6f422e1 -r f5a43dc1e123 pkgtools/pkg_install/files/add/perform.c
--- a/pkgtools/pkg_install/files/add/perform.c  Fri Apr 10 21:19:01 2009 +0000
+++ b/pkgtools/pkg_install/files/add/perform.c  Sat Apr 11 17:38:48 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: perform.c,v 1.84 2009/03/08 14:50:36 joerg Exp $       */
+/*     $NetBSD: perform.c,v 1.84.2.1 2009/04/11 17:38:48 spz 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.84.2.1 2009/04/11 17:38:48 spz Exp $");
 
 /*-
  * Copyright (c) 2003 Grant Beattie <grant%NetBSD.org@localhost>
@@ -763,9 +763,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);
 
diff -r 87cad6f422e1 -r f5a43dc1e123 pkgtools/pkg_install/files/lib/version.h
--- a/pkgtools/pkg_install/files/lib/version.h  Fri Apr 10 21:19:01 2009 +0000
+++ b/pkgtools/pkg_install/files/lib/version.h  Sat Apr 11 17:38:48 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: version.h,v 1.120 2009/03/26 14:32:39 joerg Exp $      */
+/*     $NetBSD: version.h,v 1.120.2.1 2009/04/11 17:38:49 spz 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_ */