* aggregate: Don't let feeds set creation times for pages in the future.

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index a2c10ce5c337395ca53ef58c396cb0d8009f3ad6..0da527f25e7bff733b0f64473e6fc7f67d323982 100644 (file)
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -416,7 +416,8 @@ sub add_page (@) { #{{{
 
        # Set the mtime, this lets the build process get the right creation
        # time on record for the new page.
 
        # Set the mtime, this lets the build process get the right creation
        # time on record for the new page.

-       utime $mtime, $mtime, pagefile($guid->{page}) if defined $mtime;
+       utime $mtime, $mtime, pagefile($guid->{page})
+               if defined $mtime && $mtime <= time;

 } #}}}
 
 sub htmlescape ($) { #{{{
 } #}}}
 
 sub htmlescape ($) { #{{{

diff --git a/debian/changelog b/debian/changelog
index feeb7bdc71c1cbc2018f7a99d9e2d2bea7a49fa6..72b8a5839555b3d02c36ce8a2c9becb824300233 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ ikiwiki (2.21) UNRELEASED; urgency=low
   * Old versions of git-init don't support --git-dir or GIT_DIR with
     --bare. Change ikiwiki-makerepo to use a method that should work with
     those older versions too.
   * Old versions of git-init don't support --git-dir or GIT_DIR with
     --bare. Change ikiwiki-makerepo to use a method that should work with
     those older versions too.

+  * aggregate: Don't let feeds set creation times for pages in the future.

 
  -- Joey Hess <joeyh@debian.org>  Fri, 11 Jan 2008 15:09:37 -0500
 
 
  -- Joey Hess <joeyh@debian.org>  Fri, 11 Jan 2008 15:09:37 -0500