urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* aggregate: Fix stupid mistake introduced when converting it to use 

the needsbuild hook. This resulted in feeds not being removed when pages
  were updated, and probably other bugs.
* aggregate: Avoid uninitialised value warning when removing a feed that
  has an expired guid.
master
Joey Hess 2007-12-30 14:49:25 -05:00
parent 3e784ea8a1
commit f0f52e602d
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
IkiWiki/Plugin/aggregate.pm
View File

@ -54,11 +54,11 @@ sub needsbuild (@) { #{{{
loadstate(); # if not already loaded loadstate(); # if not already loaded
foreach my $page (keys %pagestate) { foreach my $feed (values %feeds) {
if (grep { $_ eq $pagesources{$page} } @$needsbuild) { if (grep { $_ eq $pagesources{$feed->{sourcepage}} } @$needsbuild) {
# Mark all feeds originating on this page as removable; # Mark all feeds originating on this page as removable;
# preprocess will unmark those that still exist. # preprocess will unmark those that still exist.
remove_feeds($page); remove_feeds($feed->{sourcepage});
} }
} }
} # }}} } # }}}
@ -182,7 +182,8 @@ sub savestate () { #{{{
} }
} }
else { else {
unlink pagefile($data->{page}); unlink pagefile($data->{page})
if exists $data->{page};
} }
next; next;
} }

5
debian/changelog vendored
View File

@ -9,6 +9,11 @@ ikiwiki (2.17) UNRELEASED; urgency=low
and supporting negated pagespecs and added whitespace. and supporting negated pagespecs and added whitespace.
* map: Fix handling of common prefix to handle the case where it's * map: Fix handling of common prefix to handle the case where it's
in a subdirectory. Patch by Larry Clapp. in a subdirectory. Patch by Larry Clapp.
* aggregate: Fix stupid mistake introduced when converting it to use
the needsbuild hook. This resulted in feeds not being removed when pages
were updated, and probably other bugs.
* aggregate: Avoid uninitialised value warning when removing a feed that
has an expired guid.
-- Joey Hess <joeyh@debian.org> Wed, 19 Dec 2007 16:39:07 -0500 -- Joey Hess <joeyh@debian.org> Wed, 19 Dec 2007 16:39:07 -0500

2
po/ikiwiki.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2007-12-27 19:28-0500\n" "POT-Creation-Date: 2007-12-30 14:16-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"