summaryrefslogtreecommitdiff
path: root/usr.sbin/pkg_add
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2014-06-10 15:50:02 +0000
committerMarc Espie <espie@cvs.openbsd.org>2014-06-10 15:50:02 +0000
commitacf798935a6134a5662826ef0dac137d1aeb1804 (patch)
treec32a5a57403445740637b2ae4606dedb190ed270 /usr.sbin/pkg_add
parent44b27be5ce461a791fdc15073da625453131692a (diff)
get verbose_system in line with _system, do not display \&code snippets...
Diffstat (limited to 'usr.sbin/pkg_add')
-rw-r--r--usr.sbin/pkg_add/OpenBSD/State.pm11
1 files changed, 9 insertions, 2 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/State.pm b/usr.sbin/pkg_add/OpenBSD/State.pm
index 7bf339b5752..12ea7cb4d72 100644
--- a/usr.sbin/pkg_add/OpenBSD/State.pm
+++ b/usr.sbin/pkg_add/OpenBSD/State.pm
@@ -1,5 +1,5 @@
# ex:ts=8 sw=4:
-# $OpenBSD: State.pm,v 1.29 2014/05/30 15:04:54 espie Exp $
+# $OpenBSD: State.pm,v 1.30 2014/06/10 15:50:01 espie Exp $
#
# Copyright (c) 2007-2014 Marc Espie <espie@openbsd.org>
#
@@ -441,8 +441,15 @@ sub system
sub verbose_system
{
my $self = shift;
+ my @p = @_;
+ if (ref $p[0]) {
+ shift @p;
+ }
+ if (ref $p[0]) {
+ shift @p;
+ }
- $self->print("Running #1", join(' ', @_));
+ $self->print("Running #1", join(' ', @p));
my $r = $self->_system(@_);
if ($r != 0) {
$self->say("... failed: #1", $self->child_error);