diff options
author | Marc Espie <espie@cvs.openbsd.org> | 2007-03-19 09:57:41 +0000 |
---|---|---|
committer | Marc Espie <espie@cvs.openbsd.org> | 2007-03-19 09:57:41 +0000 |
commit | b143c0e7d89e6da28b0b9d2a3155cab282c726f2 (patch) | |
tree | 3cf8687277bf0aecd39425abe2e97f3f8f521ea0 /usr.sbin/pkg_add | |
parent | 7e7aece722494212f487b79ab0bb273b1671797a (diff) |
make `no @owner', `weird mode' and `@dirrm' into errors.
Diffstat (limited to 'usr.sbin/pkg_add')
-rw-r--r-- | usr.sbin/pkg_add/pkg_create | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/usr.sbin/pkg_add/pkg_create b/usr.sbin/pkg_add/pkg_create index 67053c880db..1697423766b 100644 --- a/usr.sbin/pkg_add/pkg_create +++ b/usr.sbin/pkg_add/pkg_create @@ -1,6 +1,6 @@ #! /usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: pkg_create,v 1.51 2007/03/18 18:48:20 espie Exp $ +# $OpenBSD: pkg_create,v 1.52 2007/03/19 09:57:40 espie Exp $ # # Copyright (c) 2003-2004 Marc Espie <espie@openbsd.org> # @@ -47,21 +47,24 @@ sub archive my $o = $arc->prepare_long($self); if (!defined $self->{owner} && !$o->isSymLink()) { if ($o->{uname} ne 'root' && $o->{uname} ne 'bin') { - print STDERR "Warning: no \@owner for ", + print STDERR "Error: no \@owner for ", $self->fullname(), " (", $o->{uname}, ")\n"; + $main::errors++; } } if (!defined $self->{group} && !$o->isSymLink()) { if ($o->{gname} ne 'bin' && $o->{gname} ne 'wheel') { print STDERR "Warning: no \@group for ", $self->fullname(), " (", $o->{gname}, ")\n"; +# $main::errors++; } } if (!defined $self->{mode} && $o->isFile()) { if (($o->{mode} & (S_ISUID | S_ISGID | S_IWOTH)) != 0) { - print STDERR "Warning: weird mode for ", + print STDERR "Error: weird mode for ", $self->fullname(), ": ", sprintf("%4o", $o->{mode} & (S_IRWXU | S_IRWXG | S_IRWXO | S_ISUID | S_ISGID)), "\n"; + $main::errors++; } } $o->write() unless $main::errors; @@ -96,8 +99,9 @@ my $warned; sub compute_checksum { if (!$warned) { - print STDERR "Warning: \@dirrm is deprecated\n"; + print STDERR "Error: \@dirrm is deprecated\n"; $warned=1; + $main::errors++; } } |