diff options
| author |   espie <espie@openbsd.org> | 2009-10-11 11:01:44 +0000 |
|---|---|---|
| committer | espie <espie@openbsd.org> | 2009-10-11 11:01:44 +0000 |
| commit | 1d21ea705eca675a6e3b4e46e194843f94ae125e (patch) | |
| tree | 6c2ef42247ba709cb95d521b384850e3b5469178 | |
| parent | store installed packages in a hash, since we have simple keys for that. (diff) | |
| download | wireguard-openbsd-1d21ea705eca675a6e3b4e46e194843f94ae125e.tar.xz wireguard-openbsd-1d21ea705eca675a6e3b4e46e194843f94ae125e.zip | |
overlay extract/delete/install messages, for shorter reports in normal mode
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Delete.pm | 4 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/pkg_add | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Delete.pm b/usr.sbin/pkg_add/OpenBSD/Delete.pm index 1d87fe078a3..23fa4596612 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.81 2009/04/19 14:58:32 espie Exp $ +# $OpenBSD: Delete.pm,v 1.82 2009/10/11 11:01:44 espie Exp $ # # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org> # @@ -115,6 +115,7 @@ sub delete_package OpenBSD::Vstat::synchronize(); delete_plist($plist, $state); + $state->progress->next; } sub unregister_dependencies @@ -147,7 +148,6 @@ sub delete_plist $plist->register_manpage($state); manpages_unindex($state); $plist->delete_and_progress($state, \$donesize, $totsize); - $state->progress->next; if ($plist->has(UNDISPLAY)) { $plist->get(UNDISPLAY)->prepare($state); } diff --git a/usr.sbin/pkg_add/pkg_add b/usr.sbin/pkg_add/pkg_add index a4946300fea..bc6f72cbad1 100644 --- a/usr.sbin/pkg_add/pkg_add +++ b/usr.sbin/pkg_add/pkg_add @@ -1,7 +1,7 @@ #! /usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: pkg_add,v 1.337 2009/10/11 10:49:05 espie Exp $ +# $OpenBSD: pkg_add,v 1.338 2009/10/11 11:01:44 espie Exp $ # # Copyright (c) 2003-2009 Marc Espie <espie@openbsd.org> # @@ -448,7 +448,7 @@ sub really_add $errors++; } }; - $state->progress->next; + $state->progress->clear; if ($state->{interrupted} || $errors) { Fatal partial_install("Installation of $pkgname failed", $set, $state); @@ -473,6 +473,7 @@ sub really_add delete $state->{updatedepends}->{$oldname}; } OpenBSD::PkgCfl::unregister($o->{plist}, $state); + $state->progress->clear; } # Here there should be code to handle old libs |