From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Wed, 16 Aug 2006 17:37:36 +0000 (+0000)
Subject: * Fix an infinite loop in the aggregator when finding a unique filename.
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/53cf5ca9a30fe856793d2a38b52c8b78b2aba17b

* 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 23428cb0e..6c9958df8 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -267,7 +267,7 @@ sub add_page (@) { #{{{
 			$page=$feed->{dir}."/item";
 		}
 		my $c="";
-		while (exists $IkiWiki::pagecase{lc $page} ||
+		while (exists $IkiWiki::pagecase{lc $page.$c} ||
 		       -e pagefile($page.$c)) {
 			$c++
 		}
diff --git a/debian/changelog b/debian/changelog
index e89a57cb1..e917f155f 100644
--- 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 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