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 942dbbcc3e0ad69d0148382ba163869dce71c58d..cb165acd2a0e7bb2c647d990d7723bf18a33b291 100644 (file)
--- 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 : "",
                                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,
                        );
                }
                                ctime => $entry->issued ? ($entry->issued->epoch || time) : time,
                        );
                }

diff --git a/debian/changelog b/debian/changelog
index d4a1f24719026574c08fd297cda88182d941c5c5..eed7940feb3a729c0e05ae47fc2699fc1129489b 100644 (file)
--- 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ó ]
 ikiwiki (2.41) unstable; urgency=low
 
   [ Adeodato Simó ]