Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 2 Jan 2014 16:04:22 +0000 (12:04 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 2 Jan 2014 16:04:22 +0000 (12:04 -0400)
IkiWiki/Plugin/aggregate.pm
debian/changelog

index 3e3eb6d9301da377b6a72128cde42f25a41da34c..28c445913f436e8ee7269fb1b3eea6ca35351bab 100644 (file)
@@ -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);
index 1b0fd18ff656759b282898c04263c1cc36736d09..d219c56bb2b61e2ccb21df70461c30a5daa8d3e2 100644 (file)
@@ -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