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

forgot to adjust for the PERMIT_* changes

Browse Source
This commit is contained in:
espie 2019-11-07 16:12:35 +00:00
parent faeca73456
commit d8e3568a01
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
infrastructure/lib/DPB/Fetch.pm
View File

@ -1,5 +1,5 @@
# ex:ts=8 sw=4:
# $OpenBSD: Fetch.pm,v 1.83 2019/11/06 14:21:54 espie Exp $
# $OpenBSD: Fetch.pm,v 1.84 2019/11/07 16:12:35 espie Exp $
#
# Copyright (c) 2010-2013 Marc Espie <espie@openbsd.org>
#
@ -40,9 +40,6 @@ sub new
if (defined $state->{subst}->value('FTP_ONLY')) {
$o->{ftp_only} = 1;
}
if (defined $state->{subst}->value('CDROM_ONLY')) {
$o->{cdrom_only} = 1;
}
my $fh = $o->open('<', "$distdir/distinfo");
if (defined $fh) {
print "Reading distinfo...";
@ -309,13 +306,7 @@ sub build_distinfo
}
bless $files, "AddDepends";
$info->{DIST} = $files;
if ($self->{cdrom_only} &&
defined $info->{PERMIT_PACKAGE_CDROM}) {
$info->{DISTIGNORE} = 1;
$info->{IGNORE} //= AddIgnore->new(
"Distfile not allowed for cdrom");
} elsif ($self->{ftp_only} &&
defined $info->{PERMIT_PACKAGE_FTP}) {
if ($self->{ftp_only} && defined $info->{PERMIT_DISTFILES}) {
$info->{DISTIGNORE} = 1;
$info->{IGNORE} //= AddIgnore->new(
"Distfile not allowed for ftp");

6
infrastructure/lib/DPB/PortInfo.pm
View File

@ -1,5 +1,5 @@
# ex:ts=8 sw=4:
# $OpenBSD: PortInfo.pm,v 1.40 2019/10/28 15:55:49 espie Exp $
# $OpenBSD: PortInfo.pm,v 1.41 2019/11/07 16:12:35 espie Exp $
#
# Copyright (c) 2010-2013 Marc Espie <espie@openbsd.org>
#
@ -314,8 +314,8 @@ my %adder = (
MASTER_SITES8 => 'AddOrderedList',
MASTER_SITES9 => 'AddOrderedList',
MULTI_PACKAGES => 'AddList',
PERMIT_DISTFILES_FTP => 'AddNegative',
PERMIT_DISTFILES_CDROM => 'AddNegative',
PERMIT_DISTFILES => 'AddNegative',
PERMIT_PACKAGE => 'AddNegative',
# not yet used, provision for regression tests
TEST_DEPENDS => "AddTestDepends",
NO_TEST => "AddNegative",