summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2007-02-04 12:46:55 +0000
committerMarc Espie <espie@cvs.openbsd.org>2007-02-04 12:46:55 +0000
commitec78776b871ba7b25c66902e80c5c4718d91b2cf (patch)
tree0ce02f655f8e6d4200892be21931791a38400e1b /usr.sbin
parent6a71cedc9c5fd531e8d88ce0cecff952c8c98194 (diff)
protect `normal' installs against archive burps.
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/pkg_add/Makefile3
-rw-r--r--usr.sbin/pkg_add/pkg_add9
2 files changed, 9 insertions, 3 deletions
diff --git a/usr.sbin/pkg_add/Makefile b/usr.sbin/pkg_add/Makefile
index ffe1194c588..adc82376704 100644
--- a/usr.sbin/pkg_add/Makefile
+++ b/usr.sbin/pkg_add/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.37 2006/11/29 11:10:42 espie Exp $
+# $OpenBSD: Makefile,v 1.38 2007/02/04 12:46:54 espie Exp $
.include <bsd.own.mk>
@@ -36,6 +36,7 @@ PACKAGES= \
OpenBSD/ProgressMeter.pm \
OpenBSD/Replace.pm \
OpenBSD/RequiredBy.pm \
+ OpenBSD/ScanBinary.pm \
OpenBSD/SharedItems.pm \
OpenBSD/SharedLibs.pm \
OpenBSD/Temp.pm \
diff --git a/usr.sbin/pkg_add/pkg_add b/usr.sbin/pkg_add/pkg_add
index 63b9806d250..9c5a7975071 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.220 2006/11/17 15:34:15 espie Exp $
+# $OpenBSD: pkg_add,v 1.221 2007/02/04 12:46:54 espie Exp $
#
# Copyright (c) 2003-2004 Marc Espie <espie@openbsd.org>
#
@@ -402,7 +402,12 @@ sub really_add($$)
}
}
- $handle->finish_and_close();
+ try {
+ $handle->finish_and_close(); }
+ catchall {
+ Warn $_;
+ $errors++;
+ };
OpenBSD::ProgressMeter::next();
if (!($interrupted || $errors)) {