diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2009-12-17 08:21:10 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2009-12-17 08:21:10 +0000 |
| commit | 3b307801ebe8a06bc7c8fea7dfd78123b31e5ea3 (patch) | |
| tree | 3dfcd826627a3381665d3863d7591a9b193d4f63 /usr.sbin | |
| parent | d9e7604c07c5fccfcdf4f8a72dc8124583102c75 (diff) | |
display progressmeter at 0% at start of install/deinstall.
(better synch for packages that start with a huge binary)
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Add.pm | 3 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Delete.pm | 3 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Replace.pm | 7 |
3 files changed, 10 insertions, 3 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Add.pm b/usr.sbin/pkg_add/OpenBSD/Add.pm index bab630d2ada..acccea3603c 100644 --- a/usr.sbin/pkg_add/OpenBSD/Add.pm +++ b/usr.sbin/pkg_add/OpenBSD/Add.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Add.pm,v 1.97 2009/11/16 14:42:18 espie Exp $ +# $OpenBSD: Add.pm,v 1.98 2009/12/17 08:21:09 espie Exp $ # # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org> # @@ -103,6 +103,7 @@ sub perform_installation $handle->{partial} = {}; } $state->{partial} = $handle->{partial}; + $state->progress->show(0, $totsize); $handle->{plist}->install_and_progress($state, \$donesize, $totsize); $handle->{location}->finish_and_close; } diff --git a/usr.sbin/pkg_add/OpenBSD/Delete.pm b/usr.sbin/pkg_add/OpenBSD/Delete.pm index 0a200664bd4..4cd6910c6a9 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.91 2009/12/14 09:35:56 espie Exp $ +# $OpenBSD: Delete.pm,v 1.92 2009/12/17 08:21:09 espie Exp $ # # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org> # @@ -148,6 +148,7 @@ sub delete_plist $ENV{'PKG_PREFIX'} = $plist->localbase; $plist->register_manpage($state); manpages_unindex($state); + $state->progress->show(0, $totsize); $plist->delete_and_progress($state, \$donesize, $totsize); if ($plist->has(UNDISPLAY)) { $plist->get(UNDISPLAY)->prepare($state); diff --git a/usr.sbin/pkg_add/OpenBSD/Replace.pm b/usr.sbin/pkg_add/OpenBSD/Replace.pm index 507ffa099a7..348e88227af 100644 --- a/usr.sbin/pkg_add/OpenBSD/Replace.pm +++ b/usr.sbin/pkg_add/OpenBSD/Replace.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Replace.pm,v 1.60 2009/12/14 18:11:26 espie Exp $ +# $OpenBSD: Replace.pm,v 1.61 2009/12/17 08:21:09 espie Exp $ # # Copyright (c) 2004-2006 Marc Espie <espie@openbsd.org> # @@ -436,7 +436,12 @@ sub do_save_libs my $dest = installed_info($stub_name); $state->say("Keeping them in $stub_name") if $state->{verbose}; + + if ($state->{not}) { + require OpenBSD::SharedLibs; + + OpenBSD::SharedLibs::add_libs_from_plist($stub_list); $stub_list->to_cache; $o->plist->to_cache; } else { |