diff options
| author | joerg <joerg> | 2008-08-05 22:25:54 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2008-08-05 22:25:54 +0000 |
| commit | 8fdfcc55ec2ab5896e05e0de1d2523e12a190f50 (patch) | |
| tree | dfd08ca9515528f17fd62f44d064707b4cb1ac1b | |
| parent | dda6c917b03b24b31d043a97d08d4cf942d50765 (diff) | |
| download | pkgsrc-8fdfcc55ec2ab5896e05e0de1d2523e12a190f50.tar.gz | |
Call chmod directly and just use 555 for the deinstall script.
| -rw-r--r-- | pkgtools/pkg_install/files/delete/perform.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgtools/pkg_install/files/delete/perform.c b/pkgtools/pkg_install/files/delete/perform.c index a09b19eaaac..b50609df67b 100644 --- a/pkgtools/pkg_install/files/delete/perform.c +++ b/pkgtools/pkg_install/files/delete/perform.c @@ -1,4 +1,4 @@ -/* $NetBSD: perform.c,v 1.23.2.8 2008/08/05 20:41:04 joerg Exp $ */ +/* $NetBSD: perform.c,v 1.23.2.9 2008/08/05 22:25:54 joerg Exp $ */ #if HAVE_CONFIG_H #include "config.h" @@ -11,7 +11,7 @@ #if 0 static const char *rcsid = "from FreeBSD Id: perform.c,v 1.15 1997/10/13 15:03:52 jkh Exp"; #else -__RCSID("$NetBSD: perform.c,v 1.23.2.8 2008/08/05 20:41:04 joerg Exp $"); +__RCSID("$NetBSD: perform.c,v 1.23.2.9 2008/08/05 22:25:54 joerg Exp $"); #endif #endif @@ -740,7 +740,8 @@ pkg_do(char *pkg) "(arg: %s).\n", text, target); } else { pkgdir = xasprintf("%s/%s", _pkgdb_getPKGDB_DIR(), pkg); - (void) fexec(CHMOD_CMD, "+x", fname, NULL); /* make sure */ + if (chmod(fname, 0555)) + warn("chmod of %s failed", fname); if (fcexec(pkgdir, fname, pkg, target, NULL)) { warnx("%s script returned error status", text); if (!Force) { @@ -804,7 +805,8 @@ pkg_do(char *pkg) printf("Would execute post-de-install script at this point (arg: POST-DEINSTALL).\n"); else { pkgdir = xasprintf("%s/%s", _pkgdb_getPKGDB_DIR(), pkg); - (void) fexec(CHMOD_CMD, "+x", fname, NULL); /* make sure */ + if (chmod(fname, 0555)) + warn("chmod of %s failed", fname); if (fcexec(pkgdir, fname, pkg, "POST-DEINSTALL", NULL)) { warnx("post-deinstall script returned error status"); if (!Force) { |