From 97e4fc0946cacc7dc1190cfd0a8079d7f1fe603c Mon Sep 17 00:00:00 2001 From: Marc Espie Date: Sat, 2 Jan 2010 16:51:52 +0000 Subject: keep going after collisions --- usr.sbin/pkg_add/OpenBSD/UpdateSet.pm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'usr.sbin/pkg_add/OpenBSD/UpdateSet.pm') diff --git a/usr.sbin/pkg_add/OpenBSD/UpdateSet.pm b/usr.sbin/pkg_add/OpenBSD/UpdateSet.pm index 7184e37cca2..87fc3cbd9d9 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.49 2010/01/01 13:00:05 espie Exp $ +# $OpenBSD: UpdateSet.pm,v 1.50 2010/01/02 16:51:51 espie Exp $ # # Copyright (c) 2007-2010 Marc Espie # @@ -305,10 +305,12 @@ sub validate_plists $state->vstat->tally; } if ($state->{problems}) { - require OpenBSD::Error; - OpenBSD::Error::Fatal "fatal issues in ", $self->short_print; + $state->vstat->drop_changes; + return 0; + } else { + $state->vstat->synchronize; + return 1; } - $state->vstat->synchronize; } sub compute_size -- cgit v1.2.3