diff options
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Delete.pm | 8 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/PkgAdd.pm | 4 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/PkgDelete.pm | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Delete.pm b/usr.sbin/pkg_add/OpenBSD/Delete.pm index 37a46d43b54..c3e9cda4c82 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.151 2018/06/15 09:37:29 espie Exp $ +# $OpenBSD: Delete.pm,v 1.152 2018/06/19 14:27:08 espie Exp $ # # Copyright (c) 2003-2014 Marc Espie <espie@openbsd.org> # @@ -81,7 +81,7 @@ sub remove_packing_info sub delete_package { - my ($pkgname, $state) = @_; + my ($pkgname, $state, $set) = @_; $state->progress->message($state->f("reading list for #1", $pkgname)); my $plist = OpenBSD::PackingList->from_installation($pkgname) or $state->fatal("bad package #1", $pkgname); @@ -112,7 +112,7 @@ sub delete_package if $state->{problems}; $state->vstat->synchronize; - delete_plist($plist, $state); + delete_plist($plist, $state, $set); } sub unregister_dependencies @@ -137,7 +137,7 @@ sub unregister_dependencies sub delete_plist { - my ($plist, $state) = @_; + my ($plist, $state, $set) = @_; my $pkgname = $plist->pkgname; $state->{pkgname} = $pkgname; diff --git a/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm b/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm index ef80ac61d9a..d2d151514e3 100644 --- a/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm +++ b/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm @@ -1,7 +1,7 @@ #! /usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: PkgAdd.pm,v 1.98 2018/02/27 22:46:53 espie Exp $ +# $OpenBSD: PkgAdd.pm,v 1.99 2018/06/19 14:27:08 espie Exp $ # # Copyright (c) 2003-2014 Marc Espie <espie@openbsd.org> # @@ -707,7 +707,7 @@ sub delete_old_packages $state->set_name_from_handle($o, '-'); require OpenBSD::Delete; try { - OpenBSD::Delete::delete_plist($o->plist, $state); + OpenBSD::Delete::delete_plist($o->plist, $state, $set); } catchall { $state->errsay($_); $state->fatal(partial_install( diff --git a/usr.sbin/pkg_add/OpenBSD/PkgDelete.pm b/usr.sbin/pkg_add/OpenBSD/PkgDelete.pm index 5b0c9a0534b..93b67f9d934 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.39 2018/02/27 22:46:53 espie Exp $ +# $OpenBSD: PkgDelete.pm,v 1.40 2018/06/19 14:27:08 espie Exp $ # # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org> # @@ -252,7 +252,7 @@ sub really_remove for my $pkgname ($set->older_names) { $set->setup_header($state, $set->{older}{$pkgname}); $state->log->set_context('-'.$pkgname); - OpenBSD::Delete::delete_package($pkgname, $state); + OpenBSD::Delete::delete_package($pkgname, $state, $set); } $state->progress->next($state->ntogo); $state->syslog("Removed #1", $set->print); |