* Fix an infinite loop in the aggregator when finding a unique filename.

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index 23428cb0e7a3d3e59d32931248ec3d97d9654e50..6c9958df8c862249b1c663906e1ac06406f7fd17 100644 (file)
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -267,7 +267,7 @@ sub add_page (@) { #{{{
                        $page=$feed->{dir}."/item";
                }
                my $c="";
                        $page=$feed->{dir}."/item";
                }
                my $c="";

-               while (exists $IkiWiki::pagecase{lc $page} ||
+               while (exists $IkiWiki::pagecase{lc $page.$c} ||

                       -e pagefile($page.$c)) {
                        $c++
                }
                       -e pagefile($page.$c)) {
                        $c++
                }

diff --git a/debian/changelog b/debian/changelog
index e89a57cb127d5c10f3962ece2a323c3377642390..e917f155f6da9e1cd62963f9912d0716692bd046 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ ikiwiki (1.19) UNRELEASED; urgency=low
 
   * Fix several related bugs in page type determination during online editing.
   * Add some locking to prevent 2 aggregators from running at once.
 
   * Fix several related bugs in page type determination during online editing.
   * Add some locking to prevent 2 aggregators from running at once.

+  * Fix an infinite loop in the aggregator when finding a unique filename.

 
 

- -- Joey Hess <joeyh@debian.org>  Wed, 16 Aug 2006 13:28:34 -0400
+ -- Joey Hess <joeyh@debian.org>  Wed, 16 Aug 2006 13:32:27 -0400

 
 ikiwiki (1.18) unstable; urgency=low
 
 
 ikiwiki (1.18) unstable; urgency=low