From 69df96b71c48004a0e56fe0d305be66d00c30a22 Mon Sep 17 00:00:00 2001 From: espie Date: Sun, 4 Dec 2011 10:39:52 +0000 Subject: [PATCH] properly forget old info when rescanning... --- infrastructure/lib/DPB/Engine.pm | 10 +++++++++- infrastructure/lib/DPB/Fetch.pm | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/infrastructure/lib/DPB/Engine.pm b/infrastructure/lib/DPB/Engine.pm index 725d3a720eb..5cd6e284c10 100644 --- a/infrastructure/lib/DPB/Engine.pm +++ b/infrastructure/lib/DPB/Engine.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Engine.pm,v 1.39 2011/12/02 11:52:06 espie Exp $ +# $OpenBSD: Engine.pm,v 1.40 2011/12/04 10:39:52 espie Exp $ # # Copyright (c) 2010 Marc Espie # @@ -644,6 +644,14 @@ sub rebuild_info my @l = @{$self->{requeued}}; $self->{requeued} = []; my %subdirs = map {($_->pkgpath_and_flavors, 1)} @l; + for my $v (@l) { + if (defined $v->{info}{FDEPENDS}) { + for my $f (values %{$v->{info}{FDEPENDS}}) { + $f->forget; + } + } + delete $v->{info}; + } $self->{state}->grabber->grab_subdirs($core, \%subdirs); $core->mark_ready; } diff --git a/infrastructure/lib/DPB/Fetch.pm b/infrastructure/lib/DPB/Fetch.pm index 395f3d90a3d..b468cc99db7 100644 --- a/infrastructure/lib/DPB/Fetch.pm +++ b/infrastructure/lib/DPB/Fetch.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Fetch.pm,v 1.19 2011/12/03 11:10:48 espie Exp $ +# $OpenBSD: Fetch.pm,v 1.20 2011/12/04 10:39:52 espie Exp $ # # Copyright (c) 2010 Marc Espie # @@ -191,6 +191,14 @@ sub read_checksums return $r; } +sub forget +{ + my $self = shift; + delete $self->{size}; + delete $self->{sha}; + delete $self->{okay}; +} + sub build_distinfo { my ($self, $h, $fetch_only) = @_;