From a2fb23286fee47875f8d7d261b4c9b6a5fb3606a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 28 Dec 2013 20:02:22 -0400 Subject: [PATCH] aggregrate: Fix several bugs in handling of empty and colliding titles when generating filenames. --- IkiWiki/Plugin/aggregate.pm | 3 ++- debian/changelog | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm index 3e3eb6d93..28c445913 100644 --- a/IkiWiki/Plugin/aggregate.pm +++ b/IkiWiki/Plugin/aggregate.pm @@ -628,12 +628,12 @@ sub add_page (@) { -e "$config{srcdir}/".htmlfn($page.$c)) { $c++ } + $page=$page.$c; $guid->{page}=$page; eval { write_page($feed, $guid, $mtime, \%params) }; if ($@) { # assume failure was due to a too long filename - # (or o $c=""; $page=$feed->{dir}."/item"; while (exists $IkiWiki::pagecase{lc $page.$c} || @@ -641,6 +641,7 @@ sub add_page (@) { -e "$config{srcdir}/".htmlfn($page.$c)) { $c++ } + $page=$page.$c; $guid->{page}=$page; write_page($feed, $guid, $mtime, \%params); diff --git a/debian/changelog b/debian/changelog index 1b0fd18ff..d219c56bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,8 @@ ikiwiki (3.20130904.2) UNRELEASED; urgency=low Closes: #731197 * style.css: Add compatability definitions for more block-level html5 elements. Closes: #731199 + * aggregrate: Fix several bugs in handling of empty and colliding + titles when generating filenames. -- Joey Hess Thu, 05 Sep 2013 10:01:10 -0400