[pkgsrc/pkg_install-renovation]: pkgsrc/pkgtools/pkg_install/files pkg_instal...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f485b5cae89e
branches:  pkg_install-renovation
changeset: 541600:f485b5cae89e
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Aug 25 19:15:11 2008 +0000

description:
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.

diffstat:

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

diffs (53 lines):

diff -r dd816f683cb5 -r f485b5cae89e pkgtools/pkg_install/files/add/perform.c
--- a/pkgtools/pkg_install/files/add/perform.c  Mon Aug 25 18:43:04 2008 +0000
+++ b/pkgtools/pkg_install/files/add/perform.c  Mon Aug 25 19:15:11 2008 +0000
@@ -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@localhost>
@@ -1067,7 +1067,7 @@
        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 @@
                        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 -r dd816f683cb5 -r f485b5cae89e pkgtools/pkg_install/files/lib/version.h
--- a/pkgtools/pkg_install/files/lib/version.h  Mon Aug 25 18:43:04 2008 +0000
+++ b/pkgtools/pkg_install/files/lib/version.h  Mon Aug 25 19:15:11 2008 +0000
@@ -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_ */