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

dump all the paths with fishy behavior at end of equiv.

Browse Source 
this is a bit too much, but this catches:
SUBDIR=devel/py-gobject3,python3 make dump-vars DPB=Yes
devel/py-gobject3,python.BUILD_DEPENDS=graphics/py3-cairo STEM->=0.10.38:devel/gettext lang/python/3.2 STEM->=0.41.1p0:textproc/intltool devel/gmake archivers/xz
devel/py-gobject3,python.IS_INTERACTIVE=No
devel/py-gobject3,python.SUBPACKAGE=-main
devel/py-gobject3,python.FLAVOR=python3
devel/py-gobject3,python.BUILD_PACKAGES= -main -common
devel/py-gobject3,python.FULLPKGNAME=py3-gobject3-3.8.1p0
devel/py-gobject3,python.RUN_DEPENDS=STEM->=0.10.38:devel/gettext lang/python/3.2 devel/py-gobject3,-common graphics/py3-cairo
devel/py-gobject3,python.LIB_DEPENDS=STEM->=0.10.38:devel/gettext converters/libiconv devel/gobject-introspection
devel/py-gobject3,-common.BUILD_DEPENDS=graphics/py3-cairo STEM->=0.10.38:devel/gettext lang/python/3.2 STEM->=0.41.1p0:textproc/intltool devel/gmake archivers/xz
devel/py-gobject3,-common.IS_INTERACTIVE=No
devel/py-gobject3,-common.SUBPACKAGE=-main
devel/py-gobject3,-common.FLAVOR=python3
devel/py-gobject3,-common.BUILD_PACKAGES= -main -common
devel/py-gobject3,-common.FULLPKGNAME=py-gobject3-common-3.8.1
devel/py-gobject3,-common.RUN_DEPENDS=STEM->=0.10.38:devel/gettext lang/python/3.2

(note the "wrong" flavor, which means that
devel/py-gobject3,python3,-main ends up without an associated fullpkgname)
This commit is contained in:
espie 2013-04-22 10:06:12 +00:00
parent 9b6c92b10d
commit d339778a36
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
infrastructure/bin/dpb
View File

@ -1,7 +1,7 @@
#! /usr/bin/perl
# ex:ts=8 sw=4:
# $OpenBSD: dpb,v 1.88 2013/04/13 10:02:11 espie Exp $
# $OpenBSD: dpb,v 1.89 2013/04/22 10:06:12 espie Exp $
#
# Copyright (c) 2010 Marc Espie <espie@openbsd.org>
#
@ -803,6 +803,7 @@ if (!$state->opt('e') && !$occupied) {
$core->mark_ready;
}
DPB::PkgPath->sanity_check($state);
$state->engine->check_buildable;
if ($state->{scan_only}) {

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

@ -1,5 +1,5 @@
# ex:ts=8 sw=4:
# $OpenBSD: PkgPath.pm,v 1.37 2013/04/13 10:04:43 espie Exp $
# $OpenBSD: PkgPath.pm,v 1.38 2013/04/22 10:06:12 espie Exp $
#
# Copyright (c) 2010 Marc Espie <espie@openbsd.org>
#
@ -42,6 +42,28 @@ sub clone_properties
$n->{info} //= $o->{info};
}
sub sanity_check
{
my ($class, $state) = @_;
open my $quicklog, '>>', $state->logger->logfile('equiv');
for my $p ($class->seen) {
next if defined $p->{category};
for my $w ($p->build_path_list) {
if (!defined $w->{info}) {
print $quicklog $w->fullpkgpath,
" has no info(", $p->fullpkgpath, ")\n";
$w->{info} = DPB::PortInfo->stub;
} elsif (!defined $w->{info}{FULLPKGNAME}) {
print $quicklog $w->fullpkgpath,
" has no fullpkgname(",
$p->fullpkgpath, ")\n";
$w->{info} = DPB::PortInfo->stub;
}
}
}
}
# XXX All this code knows too much about PortInfo for proper OO
sub fullpkgname