diff options
| author |   espie <espie@openbsd.org> | 2014-03-09 09:55:10 +0000 |
|---|---|---|
| committer | espie <espie@openbsd.org> | 2014-03-09 09:55:10 +0000 |
| commit | 327cf54558306222c02406abce981f5c027d0dd6 (patch) | |
| tree | fa53f6ebd85f1f9039056b514cc1754404d8a50a | |
| parent | remove dri1 interfaces (diff) | |
| download | wireguard-openbsd-327cf54558306222c02406abce981f5c027d0dd6.tar.xz wireguard-openbsd-327cf54558306222c02406abce981f5c027d0dd6.zip | |
record errors, and only crash at the end. much less painful to synch
sets this way...
| -rw-r--r-- | usr.sbin/pkg_add/pkg_mklocatedb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/usr.sbin/pkg_add/pkg_mklocatedb b/usr.sbin/pkg_add/pkg_mklocatedb index e6d72fe86cf..258f7d74822 100644 --- a/usr.sbin/pkg_add/pkg_mklocatedb +++ b/usr.sbin/pkg_add/pkg_mklocatedb @@ -1,6 +1,6 @@ #! /usr/bin/perl # Copyright (c) 2005-2010 Marc Espie <espie@openbsd.org> -# $OpenBSD: pkg_mklocatedb,v 1.39 2013/01/27 11:39:22 espie Exp $ +# $OpenBSD: pkg_mklocatedb,v 1.40 2014/03/09 09:55:10 espie Exp $ # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -166,7 +166,8 @@ sub sync_error if ($set =~ m/etc/) { $state->errsay("Couldn't find #1 from set #2:\n\tDid you run sysmerge recently ?", $e, $set); } else { - $state->fatal("Couldn't find #1 from set #2:\n\tsrc and installation out of synch ?", $e, $set); + $state->errsay("Couldn't find #1 from set #2:\n\tsrc and installation out of synch ?", $e, $set); + $state->{fatals}++; } } @@ -194,6 +195,9 @@ sub do_source $state->fatal("Couldn't find set #1", $set); } } + if ($state->{fatals}) { + $state->fatal("Files not found, can't continue"); + } } sub do_release |