From 40051425128cd3471e3626f6df208b59d5bb8a98 Mon Sep 17 00:00:00 2001 From: kn Date: Mon, 28 Apr 2025 18:56:25 +0000 Subject: [PATCH] Stop advising to remove files on update The following only make sense on for pkg_delete(1), yet pkg_add(1) prints them as well, which is confusing at best and trips up way too many people: "You should also run ..." (often "rm -rf /something/important*") "You should also remove ..." No longer print those when -u is used. There may be some commands "i like it" ian kirill OK phessler kmos --- usr.sbin/pkg_add/OpenBSD/Delete.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.sbin/pkg_add/OpenBSD/Delete.pm b/usr.sbin/pkg_add/OpenBSD/Delete.pm index 17239fadf98..4bb57dd4d6f 100644 --- a/usr.sbin/pkg_add/OpenBSD/Delete.pm +++ b/usr.sbin/pkg_add/OpenBSD/Delete.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Delete.pm,v 1.169 2023/10/11 13:54:43 espie Exp $ +# $OpenBSD: Delete.pm,v 1.170 2025/04/28 18:56:25 kn Exp $ # # Copyright (c) 2003-2014 Marc Espie # @@ -606,7 +606,7 @@ sub delete($self, $state) if ($state->{extra}) { unlink($realname) or $state->say("problem deleting extra file #1: #2", $realname, $!); - } else { + } elsif (!$state->{update}) { $state->log("You should also remove #1", $realname); $self->mark_dir($state); } @@ -621,7 +621,7 @@ sub delete($self, $state) my $realname = $self->realname($state); if ($state->{extra}) { $self->SUPER::delete($state); - } else { + } elsif (!$state->{update}) { $state->log("You should also remove the directory #1", $realname); $self->mark_dir($state); } @@ -633,7 +633,7 @@ sub delete($self, $state) { if ($state->{extra}) { $self->run($state); - } else { + } elsif (!$state->{update}) { $state->log("You should also run #1", $self->{expanded}); } }