diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2009-11-11 12:47:14 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2009-11-11 12:47:14 +0000 |
| commit | 8cb975a940a3d400dcf0d600e7f4a7b81289203e (patch) | |
| tree | 28492eb47aadb43694767a65394d5c072508a736 | |
| parent | a8e1a00f090236076a541f74902e8d296a30b37c (diff) | |
remove redirector: if we want to run system AND log, just say so
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/PackingElement.pm | 6 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/UpdateSet.pm | 8 |
2 files changed, 4 insertions, 10 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/PackingElement.pm b/usr.sbin/pkg_add/OpenBSD/PackingElement.pm index 214c03342c2..75831c827cf 100644 --- a/usr.sbin/pkg_add/OpenBSD/PackingElement.pm +++ b/usr.sbin/pkg_add/OpenBSD/PackingElement.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: PackingElement.pm,v 1.161 2009/11/11 12:32:03 espie Exp $ +# $OpenBSD: PackingElement.pm,v 1.162 2009/11/11 12:47:13 espie Exp $ # # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org> # @@ -1197,7 +1197,7 @@ sub run OpenBSD::PackingElement::Lib::ensure_ldconfig($state); $state->say($self->keyword, " ", $self->{expanded}) if $state->{beverbose}; - $state->system(OpenBSD::Paths->sh, '-c', $self->{expanded}) + $state->log->system(OpenBSD::Paths->sh, '-c', $self->{expanded}) unless $state->{not}; } @@ -1514,7 +1514,7 @@ sub run join(' ', @args)) if $state->{beverbose}; return if $not; chmod 0755, $name; - return if $state->system($name, $pkgname, @args) == 0; + return if $state->log->system($name, $pkgname, @args) == 0; if ($state->{defines}->{scripts}) { $state->log->warn($self->beautify, " script failed\n"); } else { diff --git a/usr.sbin/pkg_add/OpenBSD/UpdateSet.pm b/usr.sbin/pkg_add/OpenBSD/UpdateSet.pm index e400f06a115..4711f3ee9a4 100644 --- a/usr.sbin/pkg_add/OpenBSD/UpdateSet.pm +++ b/usr.sbin/pkg_add/OpenBSD/UpdateSet.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: UpdateSet.pm,v 1.21 2009/11/11 12:32:03 espie Exp $ +# $OpenBSD: UpdateSet.pm,v 1.22 2009/11/11 12:47:13 espie Exp $ # # Copyright (c) 2007 Marc Espie <espie@openbsd.org> # @@ -112,12 +112,6 @@ sub errsay $self->progress->errprint(@_, "\n"); } -sub system -{ - my $self = shift; - $self->log->system(@_); -} - sub progress { my $self = shift; |