From 90b4d079605b72bb50d1da41402d994960e10937 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 12 Jun 2009 19:24:47 -0400 Subject: [PATCH] aggregate: Fix storing of changed md5. The aggregate state merge code neglected to merge changes to the md5 field of an item. Therefore, if an item's md5 changed after initial aggregation, it would be updated, and rewritten, each time thereafter. This was wasteful and indirectly led to some expire problems. --- IkiWiki/Plugin/aggregate.pm | 6 ++++++ debian/changelog | 1 + 2 files changed, 7 insertions(+) diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm index e1baae666..60c292d52 100644 --- a/IkiWiki/Plugin/aggregate.pm +++ b/IkiWiki/Plugin/aggregate.pm @@ -404,6 +404,7 @@ sub mergestate () { } # New guids can be created during aggregation. + # Guids have a few fields that may be updated during aggregation. # It's also possible that guids were removed from the on-disk state # while the aggregation was in process. That would only happen if # their feed was also removed, so any removed guids added back here @@ -412,6 +413,11 @@ sub mergestate () { if (! exists $guids{$guid}) { $guids{$guid}=$myguids{$guid}; } + else { + foreach my $field (qw{md5}) { + $guids{$guid}->{$field}=$myguids{$guid}->{$field}; + } + } } } diff --git a/debian/changelog b/debian/changelog index dbf8dac88..6444fb8ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,7 @@ ikiwiki (3.141) UNRELEASED; urgency=low openid or openid2. * Disable the Preferences link if no plugin with an auth hook is enabled. * Updated French translation. Closes: #532654 + * aggregate: Fix storing of changed md5. -- Joey Hess Tue, 02 Jun 2009 17:03:41 -0400 -- 2.39.5