diff options
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/pkg_add/pkg_add | 3 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/pkg_delete | 10 |
2 files changed, 10 insertions, 3 deletions
diff --git a/usr.sbin/pkg_add/pkg_add b/usr.sbin/pkg_add/pkg_add index e1f4c877419..b88f469dbf2 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.383 2009/11/16 12:20:32 espie Exp $ +# $OpenBSD: pkg_add,v 1.384 2009/11/16 12:32:16 espie Exp $ # # Copyright (c) 2003-2009 Marc Espie <espie@openbsd.org> # @@ -644,7 +644,6 @@ if ($opt_l && @ARGV != 0) { Usage "No pkgnames after -l"; } - setup_state(); # Here we create the list of packages to install diff --git a/usr.sbin/pkg_add/pkg_delete b/usr.sbin/pkg_add/pkg_delete index b82d7324dd5..4b5c8506c34 100644 --- a/usr.sbin/pkg_add/pkg_delete +++ b/usr.sbin/pkg_add/pkg_delete @@ -1,6 +1,6 @@ #!/usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: pkg_delete,v 1.121 2009/11/16 12:20:32 espie Exp $ +# $OpenBSD: pkg_delete,v 1.122 2009/11/16 12:32:16 espie Exp $ # # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org> # @@ -159,5 +159,13 @@ sub { rethrow $dielater; } catch { print STDERR "$0: $_\n"; + if ($_ =~ m/^Caught SIG(\w+)/o) { + kill $1, $$; + } exit(1); }; + +if ($bad) { + exit(1); +} + |