[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install/files pkg_install-20090226:

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7b0e245f5126
branches:  trunk
changeset: 555235:7b0e245f5126
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Feb 26 12:52:43 2009 +0000

description:
pkg_install-20090226:
Always try to preserve the +PRESERVE file from the old package, even
when the new one has one as well. This fixes the update case for the
special case of pkg_install itself as reported by tron@.

diffstat:

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

diffs (45 lines):

diff -r 687f0a503c17 -r 7b0e245f5126 pkgtools/pkg_install/files/add/perform.c
--- a/pkgtools/pkg_install/files/add/perform.c  Thu Feb 26 11:11:32 2009 +0000
+++ b/pkgtools/pkg_install/files/add/perform.c  Thu Feb 26 12:52:43 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: perform.c,v 1.78 2009/02/13 13:19:12 joerg Exp $       */
+/*     $NetBSD: perform.c,v 1.79 2009/02/26 12:52:43 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.78 2009/02/13 13:19:12 joerg Exp $");
+__RCSID("$NetBSD: perform.c,v 1.79 2009/02/26 12:52:43 joerg Exp $");
 
 /*-
  * Copyright (c) 2003 Grant Beattie <grant%NetBSD.org@localhost>
@@ -1111,8 +1111,7 @@
        if (preserve_meta_data_file(pkg, REQUIRED_BY_FNAME))
                return -1;
 
-       if (pkg->meta_data.meta_preserve == NULL &&
-           preserve_meta_data_file(pkg, PRESERVE_FNAME))
+       if (preserve_meta_data_file(pkg, PRESERVE_FNAME))
                return -1;
 
        if (pkg->meta_data.meta_installed_info == NULL &&
diff -r 687f0a503c17 -r 7b0e245f5126 pkgtools/pkg_install/files/lib/version.h
--- a/pkgtools/pkg_install/files/lib/version.h  Thu Feb 26 11:11:32 2009 +0000
+++ b/pkgtools/pkg_install/files/lib/version.h  Thu Feb 26 12:52:43 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: version.h,v 1.113 2009/02/25 16:29:08 joerg Exp $      */
+/*     $NetBSD: version.h,v 1.114 2009/02/26 12:52:43 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 "20090225"
+#define PKGTOOLS_VERSION "20090226"
 
 #endif /* _INST_LIB_VERSION_H_ */