diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2010-01-02 16:51:52 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2010-01-02 16:51:52 +0000 |
| commit | 97e4fc0946cacc7dc1190cfd0a8079d7f1fe603c (patch) | |
| tree | b4d380fbb558023a115ae05928d4c6acc4515062 /usr.sbin/pkg_add/OpenBSD/UpdateSet.pm | |
| parent | d61cce11e6d1a6bcba9a8f30eb2056d1b737b82b (diff) | |
keep going after collisions
Diffstat (limited to 'usr.sbin/pkg_add/OpenBSD/UpdateSet.pm')
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/UpdateSet.pm | 10 |
1 files changed, 6 insertions, 4 deletions
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 <espie@openbsd.org> # @@ -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 |