diff options
author | Marc Espie <espie@cvs.openbsd.org> | 2007-06-12 09:53:37 +0000 |
---|---|---|
committer | Marc Espie <espie@cvs.openbsd.org> | 2007-06-12 09:53:37 +0000 |
commit | f5ea31f35648f76e28be8218284ea696380dec74 (patch) | |
tree | 0280077a655a023ec2ab4dd1ac8554eaa7d41c92 /usr.sbin/pkg_add/OpenBSD/ArcCheck.pm | |
parent | 5d44a7a1991e292bfc38c019d99817638bc703fa (diff) |
tidy error messages: uses $! more consistently, do not append \n on die,
do append \n on warn.
Fix the two cases where the temp dir vanished too soon: not copying +DESC
should have been apparent. Not finding a +DISPLAY file is not a reason for
burping all over the place.
Diffstat (limited to 'usr.sbin/pkg_add/OpenBSD/ArcCheck.pm')
-rw-r--r-- | usr.sbin/pkg_add/OpenBSD/ArcCheck.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/ArcCheck.pm b/usr.sbin/pkg_add/OpenBSD/ArcCheck.pm index eddf5c28f11..cf73f6dca00 100644 --- a/usr.sbin/pkg_add/OpenBSD/ArcCheck.pm +++ b/usr.sbin/pkg_add/OpenBSD/ArcCheck.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: ArcCheck.pm,v 1.9 2007/06/04 14:40:39 espie Exp $ +# $OpenBSD: ArcCheck.pm,v 1.10 2007/06/12 09:53:36 espie Exp $ # # Copyright (c) 2005-2006 Marc Espie <espie@openbsd.org> # @@ -117,10 +117,10 @@ sub prepare_long my $filename = $item->{name}; my $entry = $self->prepare($filename); if (!defined $entry->{uname}) { - die "No user name for ", $entry->{name}, " (uid ", $entry->{uid}, ")\n"; + die "No user name for ", $entry->{name}, " (uid ", $entry->{uid}, ")"; } if (!defined $entry->{gname}) { - die "No group name for ", $entry->{name}, " (gid ", $entry->{gid}. "\n"; + die "No group name for ", $entry->{name}, " (gid ", $entry->{gid}. ")"; } my ($prefix, $name) = split_name($entry->{name}); if (length($name) > MAXFILENAME || length($prefix) > MAXPREFIX) { |