From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 3 Apr 2008 06:36:01 +0000 (-0400)
Subject: aggregate: Correct a mistake in the code that dummy up a guid for feeds lacking one.
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/de8c34df59891dd06bb79777536bc9a92f919b0a

aggregate: Correct a mistake in the code that dummy up a guid for feeds lacking one.
---

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index 942dbbcc3..cb165acd2 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -404,7 +404,7 @@ sub aggregate (@) { #{{{
 				title => defined $entry->title ? decode_entities($entry->title) : "untitled",
 				link => $entry->link,
 				content => defined $entry->content->body ? $entry->content->body : "",
-				guid => defined $entry->id ? $entry->id : time."_".$feed->name,
+				guid => defined $entry->id ? $entry->id : time."_".$feed->{name},
 				ctime => $entry->issued ? ($entry->issued->epoch || time) : time,
 			);
 		}
diff --git a/debian/changelog b/debian/changelog
index d4a1f2471..eed7940fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ikiwiki (2.42) UNRELEASED; urgency=low
+
+  * aggregate: Correct a mistake in the code that dummy up a guid for feeds
+    lacking one.
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 03 Apr 2008 02:35:39 -0400
+
 ikiwiki (2.41) unstable; urgency=low
 
   [ Adeodato Simó ]