diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2009-12-31 13:48:53 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2009-12-31 13:48:53 +0000 |
| commit | de50ae56c1a30c7995a9b681464dbd29776af065 (patch) | |
| tree | 973fe0cc8f76acb817ffc2266128ffe7956c1cda | |
| parent | aefadd81088b9f3cd0383f86a2c19f23ef30097d (diff) | |
fix for error message logging.
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Handle.pm | 4 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/pkg_add | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Handle.pm b/usr.sbin/pkg_add/OpenBSD/Handle.pm index e52c5f785ea..2a1da8abf94 100644 --- a/usr.sbin/pkg_add/OpenBSD/Handle.pm +++ b/usr.sbin/pkg_add/OpenBSD/Handle.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Handle.pm,v 1.16 2009/12/31 12:38:19 espie Exp $ +# $OpenBSD: Handle.pm,v 1.17 2009/12/31 13:48:52 espie Exp $ # # Copyright (c) 2007-2009 Marc Espie <espie@openbsd.org> # @@ -111,7 +111,7 @@ sub error_message return "bad package"; } elsif ($error == CANT_INSTALL) { if ($self->{errorinfo}) { - return "can't install: $self->{errorinfo}"; + return "$self->{errorinfo}"; } else { return "can't install"; } diff --git a/usr.sbin/pkg_add/pkg_add b/usr.sbin/pkg_add/pkg_add index f3fbb958047..0c113e672fc 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.453 2009/12/31 12:38:19 espie Exp $ +# $OpenBSD: pkg_add,v 1.454 2009/12/31 13:48:52 espie Exp $ # # Copyright (c) 2003-2009 Marc Espie <espie@openbsd.org> # @@ -667,7 +667,7 @@ sub newer_has_errors } if ($handle->has_error) { $state->set_name_from_handle($handle); - $state->log("Can't install ", $handle->pkgname, ":", + $state->log("Can't install ", $handle->pkgname, ": ", $handle->error_message, "\n"); $bad++; $set->cleanup($handle->has_error); |