diff options
| author | joerg <joerg> | 2009-02-26 12:52:43 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2009-02-26 12:52:43 +0000 |
| commit | 8f20f3a219856f957919c9244201b663cb4eb091 (patch) | |
| tree | 50eb876e4c7e185a7aef243e40572964abcb8650 /pkgtools/pkg_install/files | |
| parent | 228c5858f222ead432b720876fa47f8ca9f75cd6 (diff) | |
| download | pkgsrc-8f20f3a219856f957919c9244201b663cb4eb091.tar.gz | |
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 (limited to 'pkgtools/pkg_install/files')
| -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, 5 insertions, 6 deletions
diff --git a/pkgtools/pkg_install/files/add/perform.c b/pkgtools/pkg_install/files/add/perform.c index c46384d1d97..eacd16dce54 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.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> @@ -1111,8 +1111,7 @@ start_replacing(struct pkg_task *pkg) 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 --git a/pkgtools/pkg_install/files/lib/version.h b/pkgtools/pkg_install/files/lib/version.h index d7eb758d0ff..17b36c4589f 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.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_ */ |