summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2004-10-31 09:06:05 +0000
committerMarc Espie <espie@cvs.openbsd.org>2004-10-31 09:06:05 +0000
commit4b446e9b3634a718b75a54eb5da9630cc2b297a7 (patch)
tree68f605ebc4e21b2c276878312c378f7e115dcf0d
parentc86228318d4cb0442c5c6fd3f9ad723c0d9ae806 (diff)
Erase old code
-rw-r--r--usr.sbin/pkg_add/pkg_add7
-rw-r--r--usr.sbin/pkg_add/pkg_delete7
2 files changed, 2 insertions, 12 deletions
diff --git a/usr.sbin/pkg_add/pkg_add b/usr.sbin/pkg_add/pkg_add
index 08eaa687c25..a29aa265ec3 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.84 2004/10/20 11:38:57 espie Exp $
+# $OpenBSD: pkg_add,v 1.85 2004/10/31 09:06:04 espie Exp $
#
# Copyright (c) 2003-2004 Marc Espie <espie@openbsd.org>
#
@@ -974,11 +974,6 @@ ensure_ldconfig($state);
if ($state->{beverbose}) {
OpenBSD::Vstat::tally();
}
-if (defined $state->{display}) {
- close $state->{display};
- my $pager = $ENV{'PAGER'} || "/usr/bin/more";
- System("$pager ".$state->{displayname});
-}
$state->delayed_output();
if ($dielater) {
die $dielater;
diff --git a/usr.sbin/pkg_add/pkg_delete b/usr.sbin/pkg_add/pkg_delete
index 38ef69fcc7e..4cbb369c28a 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.64 2004/10/26 17:37:04 espie Exp $
+# $OpenBSD: pkg_delete,v 1.65 2004/10/31 09:06:04 espie Exp $
#
# Copyright (c) 2003-2004 Marc Espie <espie@openbsd.org>
#
@@ -610,11 +610,6 @@ if (defined $state->{dirs_to_rm} or defined $state->{users_to_rm} or
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";