From: Joey Hess <joey@kitenet.net>
Date: Sun, 29 Dec 2013 00:02:22 +0000 (-0400)
Subject: aggregrate: Fix several bugs in handling of empty and colliding titles when generatin... 
X-Git-Tag: debian/3.20140102~6
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/a2fb23286fee47875f8d7d261b4c9b6a5fb3606a?hp=68e266e0425bea4087a87fa541650ba2789012b5

aggregrate: Fix several bugs in handling of empty and colliding titles when generating filenames.
---

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 <joeyh@debian.org>  Thu, 05 Sep 2013 10:01:10 -0400