summaryrefslogtreecommitdiff
path: root/usr.sbin/pkg_add/pkg_delete
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2004-10-11 13:46:18 +0000
committerMarc Espie <espie@cvs.openbsd.org>2004-10-11 13:46:18 +0000
commitd8172283289fd503a4f62261a7b1ebc2af32ca7a (patch)
tree3602a6ee1d72574baf0f4f264a1a829e2ebc6e3c /usr.sbin/pkg_add/pkg_delete
parent2cc9ba7c0def09e8aaead5c57e152a6ccc852c19 (diff)
aggregate all MESSAGES and display them at the end, with proper markers to
separate distinct packages.
Diffstat (limited to 'usr.sbin/pkg_add/pkg_delete')
-rw-r--r--usr.sbin/pkg_add/pkg_delete9
1 files changed, 7 insertions, 2 deletions
diff --git a/usr.sbin/pkg_add/pkg_delete b/usr.sbin/pkg_add/pkg_delete
index 3d805145109..e3359386258 100644
--- a/usr.sbin/pkg_add/pkg_delete
+++ b/usr.sbin/pkg_add/pkg_delete
@@ -1,6 +1,6 @@
#!/usr/bin/perl
# ex:ts=8 sw=4:
-# $OpenBSD: pkg_delete,v 1.53 2004/10/11 13:29:05 espie Exp $
+# $OpenBSD: pkg_delete,v 1.54 2004/10/11 13:46:17 espie Exp $
#
# Copyright (c) 2003-2004 Marc Espie <espie@openbsd.org>
#
@@ -559,7 +559,7 @@ sub delete_package
}
if ($plist->has(UNDISPLAY)) {
- $plist->get(UNDISPLAY)->delete($state);
+ $plist->get(UNDISPLAY)->prepare($state);
}
# guard against duplicate pkgdep
@@ -729,6 +729,11 @@ ensure_ldconfig($opt_v) unless $opt_n;
cleanup_shared_items($state);
OpenBSD::PackingElement::Fontdir::finish_fontdirs();
+if (defined $state->{display}) {
+ close $state->{display};
+ my $pager = $ENV{'PAGER'} || "/usr/bin/more";
+ System("$pager ".$state->{displayname});
+}
my $logname = OpenBSD::Logger::logname();
if (defined $logname) {
print "Problems logged as $logname\n";