diff options
| author | joerg <joerg> | 2008-08-05 22:56:24 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2008-08-05 22:56:24 +0000 |
| commit | 149956fff8e877f3b47f8accc8a38c7e57d83425 (patch) | |
| tree | 5ea2b4f847730463704895893816f0dee44fbb48 /pkgtools/pkg_install/files/delete/perform.c | |
| parent | e21bb0302cd16136a2ccca2e5ca11da4d06ad0d7 (diff) | |
| download | pkgsrc-149956fff8e877f3b47f8accc8a38c7e57d83425.tar.gz | |
pkg_install-20080806:
Provide and use internal implementation of rm -rf.
Diffstat (limited to 'pkgtools/pkg_install/files/delete/perform.c')
| -rw-r--r-- | pkgtools/pkg_install/files/delete/perform.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgtools/pkg_install/files/delete/perform.c b/pkgtools/pkg_install/files/delete/perform.c index b50609df67b..259b1fbe062 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.9 2008/08/05 22:25:54 joerg Exp $ */ +/* $NetBSD: perform.c,v 1.23.2.10 2008/08/05 22:56:24 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.9 2008/08/05 22:25:54 joerg Exp $"); +__RCSID("$NetBSD: perform.c,v 1.23.2.10 2008/08/05 22:56:24 joerg Exp $"); #endif #endif @@ -839,8 +839,8 @@ pkg_do(char *pkg) else if (is_depoted_pkg) warnx("%s is not empty", pkgdir); else if (Force) { - if (fexec(REMOVE_CMD, "-rf", pkgdir, NULL) != 0) { - warnx("couldn't remove log entry in %s", pkgdir); + if (recursive_remove(pkgdir, 1)) { + warn("Couldn't remove log entry in %s", pkgdir); free(pkgdir); return 1; } else { |