diff options
| author | joerg <joerg> | 2008-08-25 19:15:11 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2008-08-25 19:15:11 +0000 |
| commit | a85424b5ae8297f78a2cade30e4e335332bbeb40 (patch) | |
| tree | 5f6c7055cb3535e6992013f6a98fb0008590d5b1 | |
| parent | 606ecbaab3bbc30367a2abe95d42fe29aaa22a09 (diff) | |
| download | pkgsrc-a85424b5ae8297f78a2cade30e4e335332bbeb40.tar.gz | |
pkg_install-20080825:
Fix an inverted test for fake mode. The check stopped +REQUIRED_BY and
friends from being moved to the new package, thereby breaking both the
delete and the dependency tree.
Fix a fexec to fexec_skipempty to silence
pkg_delete: package '' is not installed, /var/db/pkg//+CONTENTS missing
when updating packages with prefix or destdir being set.
| -rw-r--r-- | pkgtools/pkg_install/files/add/perform.c | 8 | ||||
| -rw-r--r-- | pkgtools/pkg_install/files/lib/version.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgtools/pkg_install/files/add/perform.c b/pkgtools/pkg_install/files/add/perform.c index cdbca3cac03..d1644b8123e 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.70.4.18 2008/08/10 22:08:16 joerg Exp $ */ +/* $NetBSD: perform.c,v 1.70.4.19 2008/08/25 19:15:11 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.70.4.18 2008/08/10 22:08:16 joerg Exp $"); +__RCSID("$NetBSD: perform.c,v 1.70.4.19 2008/08/25 19:15:11 joerg Exp $"); /*- * Copyright (c) 2003 Grant Beattie <grant@NetBSD.org> @@ -1067,7 +1067,7 @@ preserve_meta_data_file(struct pkg_task *pkg, const char *name) char *old_file, *new_file; int rv; - if (!Fake) + if (Fake) return 0; old_file = pkgdb_pkg_file(pkg->other_version, name); @@ -1103,7 +1103,7 @@ start_replacing(struct pkg_task *pkg) pkg->other_version); } if (!Fake) - fexec(BINDIR "/pkg_delete", "-K", _pkgdb_getPKGDB_DIR(), + fexec_skipempty(BINDIR "/pkg_delete", "-K", _pkgdb_getPKGDB_DIR(), "-p", pkg->prefix, Destdir ? "-P": "", Destdir ? Destdir : "", pkg->other_version, NULL); diff --git a/pkgtools/pkg_install/files/lib/version.h b/pkgtools/pkg_install/files/lib/version.h index ad95af7052c..f802e5bb207 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.102.2.14 2008/08/21 16:04:39 joerg Exp $ */ +/* $NetBSD: version.h,v 1.102.2.15 2008/08/25 19:15:11 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 "20080821" +#define PKGTOOLS_VERSION "20080825" #endif /* _INST_LIB_VERSION_H_ */ |