pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install/files/delete Fix setting of PKG_M...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/39ff26f5e802
branches:  trunk
changeset: 554341:39ff26f5e802
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Feb 12 22:23:06 2009 +0000

description:
Fix setting of PKG_METADATA_DIR.

diffstat:

 pkgtools/pkg_install/files/delete/perform.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (37 lines):

diff -r 926041acea15 -r 39ff26f5e802 pkgtools/pkg_install/files/delete/perform.c
--- a/pkgtools/pkg_install/files/delete/perform.c       Thu Feb 12 21:36:49 2009 +0000
+++ b/pkgtools/pkg_install/files/delete/perform.c       Thu Feb 12 22:23:06 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: perform.c,v 1.25 2009/02/02 12:35:01 joerg Exp $       */
+/*     $NetBSD: perform.c,v 1.26 2009/02/12 22:23:06 joerg Exp $       */
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -7,7 +7,7 @@
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: perform.c,v 1.25 2009/02/02 12:35:01 joerg Exp $");
+__RCSID("$NetBSD: perform.c,v 1.26 2009/02/12 22:23:06 joerg Exp $");
 
 /*
  * FreeBSD install - a package for the installation and maintainance
@@ -79,7 +79,6 @@
 static void require_print(void);
 static int undepend(const char *, void *);
 
-static char LogDir[MaxPathSize];
 static char linebuf[MaxPathSize];
 
 static package_t Plist;
@@ -705,7 +704,9 @@
        if (Destdir != NULL)
                setenv(PKG_DESTDIR_VNAME, Destdir, 1);
        setenv(PKG_PREFIX_VNAME, p->name, 1);
-       setenv(PKG_METADATA_DIR_VNAME, LogDir, 1);
+       fname = xasprintf("%s/%s", _pkgdb_getPKGDB_DIR(), pkg);
+       setenv(PKG_METADATA_DIR_VNAME, fname, 1);
+       free(fname);
        /*
         * Ensure that we don't do VIEW-DEINSTALL action for old packages
         * or for the package in its depot directory.



Home | Main Index | Thread Index | Old Index