diff options
| author |   espie <espie@openbsd.org> | 2011-07-12 10:56:03 +0000 |
|---|---|---|
| committer | espie <espie@openbsd.org> | 2011-07-12 10:56:03 +0000 |
| commit | 30df58edb63b31f830cfda656c9446f0bec724b1 (patch) | |
| tree | 5eedfb7abace881a89d3d1ef8b9cf2b9913d80a4 | |
| parent | put back options -Dbaddepend -Ddependencies (diff) | |
| download | wireguard-openbsd-30df58edb63b31f830cfda656c9446f0bec724b1.tar.xz wireguard-openbsd-30df58edb63b31f830cfda656c9446f0bec724b1.zip | |
be ways more verbose with -a
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/PkgDelete.pm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/PkgDelete.pm b/usr.sbin/pkg_add/OpenBSD/PkgDelete.pm index 22cad904007..af67efff284 100644 --- a/usr.sbin/pkg_add/OpenBSD/PkgDelete.pm +++ b/usr.sbin/pkg_add/OpenBSD/PkgDelete.pm @@ -1,6 +1,6 @@ #!/usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: PkgDelete.pm,v 1.13 2011/07/12 10:51:28 espie Exp $ +# $OpenBSD: PkgDelete.pm,v 1.14 2011/07/12 10:56:03 espie Exp $ # # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org> # @@ -294,9 +294,11 @@ sub remove_set } } if (keys %$bad > 0) { - if (!$state->{automatic}) { + if (!$state->{automatic} || $state->verbose) { $state->errsay("can't delete #1 without deleting #2", $set->delete_print, join(' ', sort keys %$bad)); + } + if (!$state->{automatic}) { if (delete_dependencies($state)) { my $l = create_locations($state, keys %$bad); $state->tracker->todo($l); @@ -327,6 +329,8 @@ sub remove_set for my $pkg ($set->older) { $pkg->complete_old; if ($pkg->plist->has('manual-installation')) { + $state->say("Won't delete manually installed #1", + $set->delete_print) if $state->verbose; $set->cleanup(OpenBSD::Handle::CANT_DELETE); $state->tracker->done($set); return (); |