diff options
| author | joerg <joerg@pkgsrc.org> | 2008-08-05 18:09:01 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2008-08-05 18:09:01 +0000 |
| commit | cf81e6744dd56c4f11eaf287046844b48dbcbece (patch) | |
| tree | 431f357e8d9d8c26f724bf9af626cb250f2f54a4 | |
| parent | 2d14d746c33ed096821a94626a0607aa53d26fe9 (diff) | |
| download | pkgsrc-cf81e6744dd56c4f11eaf287046844b48dbcbece.tar.gz | |
Open the database first and chdir later to emphase that the chdir is
required for the extraction.
| -rw-r--r-- | pkgtools/pkg_install/files/add/perform.c | 12 |
1 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 d2c51244fd9..9cbae083a21 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.14 2008/08/02 20:33:50 joerg Exp $ */ +/* $NetBSD: perform.c,v 1.70.4.15 2008/08/05 18:09:01 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.14 2008/08/02 20:33:50 joerg Exp $"); +__RCSID("$NetBSD: perform.c,v 1.70.4.15 2008/08/05 18:09:01 joerg Exp $"); /*- * Copyright (c) 2003 Grant Beattie <grant@NetBSD.org> @@ -620,13 +620,13 @@ extract_files(struct pkg_task *pkg) return -1; } - if (chdir(pkg->install_prefix) == -1) { - warn("Can't change into prefix: %s", pkg->install_prefix); + if (!NoRecord && !pkgdb_open(ReadWrite)) { + warn("Can't open pkgdb for writing"); return -1; } - if (!NoRecord && !pkgdb_open(ReadWrite)) { - warn("Can't open pkgdb for writing"); + if (chdir(pkg->install_prefix) == -1) { + warn("Can't change into prefix: %s", pkg->install_prefix); return -1; } |