summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorespie <espie@openbsd.org>2005-08-22 11:30:30 +0000
committerespie <espie@openbsd.org>2005-08-22 11:30:30 +0000
commit3a1d9cf1b9bdcf83534e039e09bd7ed85772e01d (patch)
tree58dc5792c08c2d9cd674f55bf9511e5585aaaa73
parentmaintain a counter of problems encountered per-filesystem. (diff)
downloadwireguard-openbsd-3a1d9cf1b9bdcf83534e039e09bd7ed85772e01d.tar.xz
wireguard-openbsd-3a1d9cf1b9bdcf83534e039e09bd7ed85772e01d.zip
while scanning a potential package, process issues anyways:
if create() fails, we want to remove any stub file (and report the problem), so that tools won't get confused in believing the packing-list got created correctly.
-rw-r--r--usr.sbin/pkg_add/OpenBSD/PackageLocator.pm9
1 files changed, 7 insertions, 2 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/PackageLocator.pm b/usr.sbin/pkg_add/OpenBSD/PackageLocator.pm
index 0706d61bc12..9bfd62dff0e 100644
--- a/usr.sbin/pkg_add/OpenBSD/PackageLocator.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PackageLocator.pm
@@ -1,5 +1,5 @@
# ex:ts=8 sw=4:
-# $OpenBSD: PackageLocator.pm,v 1.19 2005/08/19 00:10:56 espie Exp $
+# $OpenBSD: PackageLocator.pm,v 1.20 2005/08/22 11:30:30 espie Exp $
#
# Copyright (c) 2003-2004 Marc Espie <espie@openbsd.org>
#
@@ -398,7 +398,12 @@ OKAY:
while (my $e = $self->next()) {
if ($e->isFile() && is_info_name($e->{name})) {
$e->{name}=$dir.$e->{name};
- eval { $e->create(); }
+ eval { $e->create(); };
+ if ($@) {
+ unlink($e->{name});
+ $@ =~ s/\s+at.*//;
+ print STDERR $@;
+ }
} else {
$self->unput();
last;