kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pkg_install-20090226:

Browse source 
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@.
This commit is contained in:
joerg 2009-02-26 12:52:43 +00:00
parent 7342e9989a
commit 816c3045cd
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgtools/pkg_install/files/add/perform.c
View file

@ -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 &&

4
pkgtools/pkg_install/files/lib/version.h
View file

@ -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_ */