summaryrefslogtreecommitdiffstats
path: root/usr.sbin/pkg_install/delete/perform.c
diff options
context:
space:
mode:
authorjkh <jkh@FreeBSD.org>1994-09-29 13:19:43 +0000
committerjkh <jkh@FreeBSD.org>1994-09-29 13:19:43 +0000
commit3ef0581e73d5178f71ceb3fa2ec31b843c8d49b8 (patch)
tree0a54543e352f476b57ae299bf0e92040f9dc3a94 /usr.sbin/pkg_install/delete/perform.c
parente9bb220eefc37eecee5de118173282f633485000 (diff)
downloadFreeBSD-src-3ef0581e73d5178f71ceb3fa2ec31b843c8d49b8.zip
FreeBSD-src-3ef0581e73d5178f71ceb3fa2ec31b843c8d49b8.tar.gz
Don't let pkg_delete remove the recorded location until everything has
absolutely, positively been successfully removed. Reviewed by: Submitted by: Obtained from:
Diffstat (limited to 'usr.sbin/pkg_install/delete/perform.c')
-rw-r--r--usr.sbin/pkg_install/delete/perform.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/pkg_install/delete/perform.c b/usr.sbin/pkg_install/delete/perform.c
index 6fce7db..0b94b2c 100644
--- a/usr.sbin/pkg_install/delete/perform.c
+++ b/usr.sbin/pkg_install/delete/perform.c
@@ -1,5 +1,5 @@
#ifndef lint
-static const char *rcsid = "$Id: perform.c,v 1.3 1993/10/08 01:19:35 jkh Exp $";
+static const char *rcsid = "$Id: perform.c,v 1.4 1994/05/25 18:00:02 asami Exp $";
#endif
/*
@@ -100,8 +100,8 @@ pkg_do(char *pkg)
}
if (chdir(home) == FAIL)
barf("Toto! This doesn't look like Kansas anymore!");
- delete_package(FALSE, &Plist);
- if (!Fake && vsystem("%s -r %s", REMOVE_CMD, LogDir)) {
+ if (!Fake && delete_package(FALSE, &Plist) != FAIL &&
+ vsystem("%s -r %s", REMOVE_CMD, LogDir)) {
whinge("Couldn't remove log entry in %s, de-install failed.", LogDir);
return 1;
}
OpenPOWER on IntegriCloud