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

zap complicated bogus logic,

Browse Source 
fetch+immediate build should work much better now.
This commit is contained in:
espie 2013-06-15 20:06:50 +00:00
parent f1ffd1c631
commit 3ae7f059c8
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
infrastructure/lib/DPB/Engine.pm
View File

@ -1,5 +1,5 @@
# ex:ts=8 sw=4:
# $OpenBSD: Engine.pm,v 1.77 2013/05/01 22:39:24 espie Exp $
# $OpenBSD: Engine.pm,v 1.78 2013/06/15 20:06:50 espie Exp $
#
# Copyright (c) 2010 Marc Espie <espie@openbsd.org>
#
@ -382,9 +382,6 @@ sub new_queue
sub is_done
{
my ($self, $v) = @_;
if ($v->checked_already) {
return 1;
}
if ($v->check($self->{engine}{logger})) {
$self->log('B', $v);
return 1;

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

@ -1,5 +1,5 @@
# ex:ts=8 sw=4:
# $OpenBSD: Fetch.pm,v 1.51 2013/05/08 08:38:37 espie Exp $
# $OpenBSD: Fetch.pm,v 1.52 2013/06/15 20:06:50 espie Exp $
#
# Copyright (c) 2010 Marc Espie <espie@openbsd.org>
#
@ -60,9 +60,6 @@ sub debug_dump
if ($self->{okay}) {
$msg .= "(okay)";
}
if ($self->{checked}) {
$msg .= "(checked)";
}
}
sub cached
@ -127,12 +124,6 @@ sub filename
return $self->distdir($self->{name});
}
sub checked_already
{
my $self = shift;
return $self->{okay} || $self->{checked};
}
# this is the entry point from the Engine, this is run as soon as the path
# has been scanned. For performance reasons, we cannot run a sha at that point.
sub check
@ -209,7 +200,6 @@ sub checksize
print $fh "size does not match\n";
return 0;
}
$self->{checked} = 1;
return 1;
}
@ -341,6 +331,7 @@ sub cached_checksum
return 1;
}
}
print $fh "UNKNOWN (uncached)\n";
return 0;
}