osm: Convert savestate hook into a changes hook

savestate is not the right place to write wiki content, and in particular
this breaks websetup if osm's dependencies are not installed, even if
the osm plugin is not actually enabled. (Closes: #719913)

This is not a full solution: it should be possible to render the PoI files
for only the maps that changed, from the format, changes or rendered
hook. However, getting that right would require more understanding of
this plugin, and this version is enough to not break websetup. This
version is the closest correct hook to the one where this previously
took place.

diff --git a/IkiWiki/Plugin/osm.pm b/IkiWiki/Plugin/osm.pm
index 472e26945a75575215218294c2a01cc68748bbf3..a5af4ed21b1acb89d89d87083643cca729c6be36 100644 (file)
--- a/IkiWiki/Plugin/osm.pm
+++ b/IkiWiki/Plugin/osm.pm
@@ -14,7 +14,7 @@ sub import {
        hook(type => "format", id => "osm", call => \&format);
        hook(type => "preprocess", id => "osm", call => \&preprocess);
        hook(type => "preprocess", id => "waypoint", call => \&process_waypoint);
-       hook(type => "savestate", id => "waypoint", call => \&savestate);
+       hook(type => "changes", id => "waypoint", call => \&changes);
        hook(type => "cgi", id => "osm", call => \&cgi);
 }
 
@@ -280,7 +280,7 @@ sub scrub_lonlat($$$) {
        return ($lon, $lat);
 }
 
-sub savestate {
+sub changes {
        my %waypoints = ();
        my %linestrings = ();
 

diff --git a/debian/changelog b/debian/changelog
index 455e5981f2dfa8e1268573011fb64fc196f0cb95..437890a7baf411ef793226f209e9c8c310be65a3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,10 @@ ikiwiki (3.20170112) UNRELEASED; urgency=medium
     default when using the default Discount implementation. A new
     mdwn_alpha_list option can be used to restore the old
     interpretation.
+  * osm: Convert savestate hook into a changes hook. savestate is not
+    the right place to write wiki content, and in particular this
+    breaks websetup if osm's dependencies are not installed, even
+    if the osm plugin is not actually enabled. (Closes: #719913)
 
  -- Simon McVittie <smcv@debian.org>  Sun, 14 May 2017 15:34:52 +0100