cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

work a bit harder so that pkgpaths do not gain a bogus info by

Browse Source 
autovivification

this allows to use is_stub once again
This commit is contained in:
espie 2020-05-31 19:24:26 +00:00
parent 2a9b6a49c6
commit 4351660abb
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
infrastructure/lib/DPB/PkgPath.pm
View File

@ -1,5 +1,5 @@
# ex:ts=8 sw=4:
# $OpenBSD: PkgPath.pm,v 1.62 2020/05/28 20:53:40 espie Exp $
# $OpenBSD: PkgPath.pm,v 1.63 2020/05/31 19:24:26 espie Exp $
#
# Copyright (c) 2010-2013 Marc Espie <espie@openbsd.org>
#
@ -49,8 +49,12 @@ sub path
sub clone_properties
{
my ($n, $o) = @_;
$n->{has} //= $o->{has};
$n->{info} //= $o->{info};
if (defined $o->{has} && !defined $n->{has}) {
$n->{has} = $o->{has};
}
if (defined $o->{info} && !defined $n->{info}) {
$n->{info} = $o->{info};
}
}
my $lock_bypkgname = {};
@ -87,7 +91,7 @@ sub sanity_check
next if defined $p->{category};
next unless defined $p->{info};
for my $w ($p->build_path_list) {
next if $w->{info} eq DPB::PortInfo->stub;
next if $w->{info}->is_stub;
my $reason = $class->check_path($w, $p);
if (defined $reason) {
$reason = $w->fullpkgpath.$reason;
@ -123,7 +127,11 @@ sub has_fullpkgname
sub flavor
{
my $self = shift;
return $self->{info}{FLAVOR};
if (defined $self->{info}) {
return $self->{info}{FLAVOR};
} else {
return undef;
}
}
sub subpackage