openbsd/src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2026-04-27 15:46:02 +00:00
Code Issues Projects Releases Wiki Activity

Stop advising to remove files on update

Browse Source 
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
This commit is contained in:
kn
2025-04-28 18:56:25 +00:00
parent fc8da380b4
commit 4005142512
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
usr.sbin/pkg_add/OpenBSD/Delete.pm
View File

@@ -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 <espie@openbsd.org>
#
@@ -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});
}
}