diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2010-01-01 12:46:10 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2010-01-01 12:46:10 +0000 |
| commit | 7b556f7f62d98a664f37d321a025cb22e44817fd (patch) | |
| tree | ae86a8ad95c8baab72b31f255f4e0f55bbd4a106 | |
| parent | e7a0ee3db5c98c4ec603251bc8884c3f461d1702 (diff) | |
propagate errorinfo thru set->cleanup (finally better messages than
can't install)
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/UpdateSet.pm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/UpdateSet.pm b/usr.sbin/pkg_add/OpenBSD/UpdateSet.pm index acead1c5c6f..6b95aede097 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.45 2009/12/29 18:16:14 espie Exp $ +# $OpenBSD: UpdateSet.pm,v 1.46 2010/01/01 12:46:09 espie Exp $ # # Copyright (c) 2007-2009 Marc Espie <espie@openbsd.org> # @@ -71,11 +71,12 @@ sub new sub cleanup { - my ($self, $error) = @_; + my ($self, $error, $errorinfo) = @_; for my $h ($self->older, $self->newer) { - $h->cleanup($error); + $h->cleanup($error, $errorinfo); } $self->{error} //= $error; + $self->{errorinfo} //= $errorinfo; delete $self->{solver}; delete $self->{conflict_cache}; $self->{finished} = 1; |