summaryrefslogtreecommitdiffstats
path: root/usr.sbin/pkg_install/delete
diff options
context:
space:
mode:
authorroberto <roberto@FreeBSD.org>2001-03-04 17:38:38 +0000
committerroberto <roberto@FreeBSD.org>2001-03-04 17:38:38 +0000
commit40c80c5e3d73bf85b4ac7840da8800ef982d924e (patch)
tree5ff30fc4b751e732e3b91541c4a3de0799dbf732 /usr.sbin/pkg_install/delete
parent63aba295dc6951c6ccd338494e8526f1594a507c (diff)
downloadFreeBSD-src-40c80c5e3d73bf85b4ac7840da8800ef982d924e.zip
FreeBSD-src-40c80c5e3d73bf85b4ac7840da8800ef982d924e.tar.gz
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 <thomas@cuivre.fr.eu.org>
Diffstat (limited to 'usr.sbin/pkg_install/delete')
-rw-r--r--usr.sbin/pkg_install/delete/perform.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/usr.sbin/pkg_install/delete/perform.c b/usr.sbin/pkg_install/delete/perform.c
index 3453cf8..d5fe32a 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);
OpenPOWER on IntegriCloud