diff options
| author |   espie <espie@openbsd.org> | 2010-01-24 14:23:47 +0000 |
|---|---|---|
| committer | espie <espie@openbsd.org> | 2010-01-24 14:23:47 +0000 |
| commit | 54edfe7afdabb25c09ce61385ccee4d657b7d73c (patch) | |
| tree | c5d9ce3e14d51ea80e34d3bd8a8fcfe718a4bfd7 | |
| parent | check package name issues (diff) | |
| download | wireguard-openbsd-54edfe7afdabb25c09ce61385ccee4d657b7d73c.tar.xz wireguard-openbsd-54edfe7afdabb25c09ce61385ccee4d657b7d73c.zip | |
prevent broken packagenames from creeping in.
| -rw-r--r-- | usr.sbin/pkg_add/pkg_create | 30 |
1 files changed, 29 insertions, 1 deletions
diff --git a/usr.sbin/pkg_add/pkg_create b/usr.sbin/pkg_add/pkg_create index 49aa92cf72e..3250633c0cb 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.133 2010/01/19 14:32:22 espie Exp $ +# $OpenBSD: pkg_create,v 1.134 2010/01/24 14:23:47 espie Exp $ # # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org> # @@ -311,6 +311,34 @@ sub avert_duplicates_and_other_checks $self->SUPER::avert_duplicates_and_other_checks($allfiles); } +package OpenBSD::PackingElement::Dependency; +sub avert_duplicates_and_other_checks +{ + my ($self, $allfiles) = @_; + + my @issues = OpenBSD::PackageName->from_string($self->{def})->has_issues; + if (@issues > 0) { + print STDERR "Error in packing-list: invalid \@", + $self->keyword, " ", $self->stringize, "\n"; + print STDERR "$self->{def}: ", join(' ', @issues), "\n"; + $main::errors++; + } + + $self->SUPER::avert_duplicates_and_other_checks($allfiles); +} + +package OpenBSD::PackingElement::Name; +sub avert_duplicates_and_other_checks +{ + my ($self, $allfiles) = @_; + + my @issues = OpenBSD::PackageName->from_string($self->name)->has_issues; + if (@issues > 0) { + print STDERR "Bad packagename ", $self->name, ":", + join(' ', @issues), "\n"; + $main::errors++; + } +} # put together file and filename, in order to handle fragments simply package MyFile; |