(no commit message)

[git.ikiwiki.info.git] / IkiWiki / Plugin / aggregate.pm

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index 3e3eb6d9301da377b6a72128cde42f25a41da34c..be7da3a710ec66a6243f414d9de62a49580bf6ad 100644 (file)
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -553,7 +553,9 @@ sub aggregate (@) {
                        };
                }
                if ($@) {
                        };
                }
                if ($@) {

-                       $feed->{message}=gettext("feed crashed XML::Feed!")." ($@)";
+                       # gettext can clobber $@
+                       my $error = $@;
+                       $feed->{message}=gettext("feed crashed XML::Feed!")." ($error)";

                        $feed->{error}=1;
                        debug($feed->{message});
                        next;
                        $feed->{error}=1;
                        debug($feed->{message});
                        next;


@@ -569,7 +571,9 @@ sub aggregate (@) {
                        # XML::Feed doesn't work around XML::Atom's bizarre
                        # API, so we will. Real unicode strings? Yes please.
                        # See [[bugs/Aggregated_Atom_feeds_are_double-encoded]]
                        # XML::Feed doesn't work around XML::Atom's bizarre
                        # API, so we will. Real unicode strings? Yes please.
                        # See [[bugs/Aggregated_Atom_feeds_are_double-encoded]]

+                       no warnings 'once';

                        local $XML::Atom::ForceUnicode = 1;
                        local $XML::Atom::ForceUnicode = 1;

+                       use warnings;

 
                        my $c=$entry->content;
                        # atom feeds may have no content, only a summary
 
                        my $c=$entry->content;
                        # atom feeds may have no content, only a summary


@@ -628,12 +632,12 @@ sub add_page (@) {
                       -e "$config{srcdir}/".htmlfn($page.$c)) {
                        $c++
                }
                       -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
 
                $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} ||
                        $c="";
                        $page=$feed->{dir}."/item";
                        while (exists $IkiWiki::pagecase{lc $page.$c} ||


@@ -641,6 +645,7 @@ sub add_page (@) {
                              -e "$config{srcdir}/".htmlfn($page.$c)) {
                                $c++
                        }
                              -e "$config{srcdir}/".htmlfn($page.$c)) {
                                $c++
                        }

+                       $page=$page.$c;

 
                        $guid->{page}=$page;
                        write_page($feed, $guid, $mtime, \%params);
 
                        $guid->{page}=$page;
                        write_page($feed, $guid, $mtime, \%params);


@@ -674,7 +679,9 @@ sub write_page ($$$$$) {
                $template=template($feed->{template}, blind_cache => 1);
        };
        if ($@) {
                $template=template($feed->{template}, blind_cache => 1);
        };
        if ($@) {

-               print STDERR gettext("failed to process template:")." $@";
+               # gettext can clobber $@
+               my $error = $@;
+               print STDERR gettext("failed to process template:")." $error";

                return;
        }
        $template->param(title => $params{title})
                return;
        }
        $template->param(title => $params{title})