From 12fd045a2c6f8eb618a603ac9a11c6274bc10bfc Mon Sep 17 00:00:00 2001 From: Ollivier Robert Date: Sun, 4 Mar 2001 17:38:38 +0000 Subject: [PATCH] When called with the "-n" command line argument, pkg_delete is supposed to inform the user of all steps it would take. The current code does not issue any messages regarding actions that would be performed by delete_package (removing files and executing @unexec commands), because when the Fake variable is 1, delete_package (which itself respects Fake and prints messages rather than taking action when it is 1) is not called at all. Fix this. PR: bin/24971 Submitted by: Thomas Quinot --- usr.sbin/pkg_install/delete/perform.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/usr.sbin/pkg_install/delete/perform.c b/usr.sbin/pkg_install/delete/perform.c index 3453cf83237..d5fe32a29d4 100644 --- a/usr.sbin/pkg_install/delete/perform.c +++ b/usr.sbin/pkg_install/delete/perform.c @@ -243,13 +243,12 @@ pkg_do(char *pkg) errx(2, __FUNCTION__ ": unable to return to working directory %s!", home); } - if (!Fake) { - /* Some packages aren't packed right, so we need to just ignore delete_package()'s status. Ugh! :-( */ - if (delete_package(FALSE, CleanDirs, &Plist) == FAIL) - warnx( + /* Some packages aren't packed right, so we need to just ignore + delete_package()'s status. Ugh! :-( */ + if (delete_package(FALSE, CleanDirs, &Plist) == FAIL) + warnx( "couldn't entirely delete package (perhaps the packing list is\n" "incorrectly specified?)"); - } if (chdir(LogDir) == FAIL) { warnx("unable to change directory to %s! deinstall failed", LogDir);