From 173879081a0058541b54267420fc2d2e5685716e Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Tue, 23 Mar 2021 18:02:20 +0100
Subject: sync with ikiwiki 3.20190207

---
 IkiWiki/Plugin/meta.pm | 20 ++++++++++++++++++--
 IkiWiki/Plugin/osm.pm  |  2 +-
 2 files changed, 19 insertions(+), 3 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index ea099f9..cd367da 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -155,14 +155,30 @@ sub preprocess (@) {
 		eval q{use Date::Parse};
 		if (! $@) {
 			my $time = str2time($value);
-			$IkiWiki::pagectime{$page}=$time if defined $time;
+			if (defined $time) {
+				$IkiWiki::pagectime{$page}=$time;
+			}
+			else {
+				error(sprintf(gettext('cannot parse date/time: %s'), $value));
+			}
+		}
+		else {
+			error $@;
 		}
 	}
 	elsif ($key eq 'updated') {
 		eval q{use Date::Parse};
 		if (! $@) {
 			my $time = str2time($value);
-			$pagestate{$page}{meta}{updated}=$time if defined $time;
+			if (defined $time) {
+				$pagestate{$page}{meta}{updated}=$time;
+			}
+			else {
+				error(sprintf(gettext('cannot parse date/time: %s'), $value));
+			}
+		}
+		else {
+			error $@;
 		}
 	}
 
diff --git a/IkiWiki/Plugin/osm.pm b/IkiWiki/Plugin/osm.pm
index a5af4ed..27db31a 100644
--- a/IkiWiki/Plugin/osm.pm
+++ b/IkiWiki/Plugin/osm.pm
@@ -233,7 +233,7 @@ sub get_tag_icon($) {
 	my $tag = shift;
 	# look for an icon attached to the tag
 	my $attached = $tag . '/' . $config{'osm_tag_default_icon'};
-	if (srcfile($attached)) {
+	if (srcfile($attached, 1)) {
 		return $attached;
 	}
 	else {
-- 
cgit v1.2.3

</a><a class='active' href='/notmuch/commit/tags/40/c8/242851610907121226t4123e2c7qb67339adb615f9a6@mail.gmail.com?h=master'>commit</a><a href='/notmuch/diff/tags/40/c8/242851610907121226t4123e2c7qb67339adb615f9a6@mail.gmail.com?h=master'>diff</a></td><td class='form'><form class='right' method='get' action='/notmuch/log/tags/40/c8/242851610907121226t4123e2c7qb67339adb615f9a6@mail.gmail.com'>
<input type='hidden' name='h' value='master'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/notmuch/commit/?h=master'>root</a>/<a href='/notmuch/commit/tags?h=master'>tags</a>/<a href='/notmuch/commit/tags/40?h=master'>40</a>/<a href='/notmuch/commit/tags/40/c8?h=master'>c8</a>/<a href='/notmuch/commit/tags/40/c8/242851610907121226t4123e2c7qb67339adb615f9a6@mail.gmail.com?h=master'>242851610907121226t4123e2c7qb67339adb615f9a6@mail.gmail.com</a></div><div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='h' value='master'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><table summary='commit info' class='commit-info'>
<tr><th>author</th><td>Jonas Smedegaard &lt;dr@jones.dk&gt;</td><td class='right'>2023-06-27 09:35:08 +0200</td></tr>
<tr><th>committer</th><td>Jonas Smedegaard &lt;dr@jones.dk&gt;</td><td class='right'>2023-06-27 09:35:08 +0200</td></tr>
<tr><th>commit</th><td colspan='2' class='oid'><a href='/notmuch/commit/tags/40/c8/242851610907121226t4123e2c7qb67339adb615f9a6@mail.gmail.com?h=master&amp;id=fd54908da2b05c526dd3bee9b6dcd093214a220d'>fd54908da2b05c526dd3bee9b6dcd093214a220d</a> (<a href='/notmuch/patch/tags/40/c8/242851610907121226t4123e2c7qb67339adb615f9a6@mail.gmail.com?id=fd54908da2b05c526dd3bee9b6dcd093214a220d'>patch</a>)</td></tr>
<tr><th>tree</th><td colspan='2' class='oid'><a href='/notmuch/tree/?h=master'>c69c845069c99d1d01044f6fafda7c08433329c6</a> /<a href='/notmuch/tree/tags/40/c8/242851610907121226t4123e2c7qb67339adb615f9a6@mail.gmail.com?h=master'>tags/40/c8/242851610907121226t4123e2c7qb67339adb615f9a6@mail.gmail.com</a></td></tr>
<tr><th>parent</th><td colspan='2' class='oid'><a href='/notmuch/commit/tags/40/c8/242851610907121226t4123e2c7qb67339adb615f9a6@mail.gmail.com?h=master&amp;id=ba46132213560cf3335d53560d519c0ec0190da2'>ba46132213560cf3335d53560d519c0ec0190da2</a> (<a href='/notmuch/diff/tags/40/c8/242851610907121226t4123e2c7qb67339adb615f9a6@mail.gmail.com?h=master&amp;id2=ba46132213560cf3335d53560d519c0ec0190da2'>diff</a>)</td></tr></table>
<div class='commit-subject'><span class='decoration'><a class='branch-deco' href='/notmuch/log/tags/40/c8/242851610907121226t4123e2c7qb67339adb615f9a6@mail.gmail.com?h=master'>master</a></span></div><div class='commit-msg'></div><div class='diffstat-header'><a href='/notmuch/diff/?h=master'>Diffstat</a> (limited to 'tags/40/c8/242851610907121226t4123e2c7qb67339adb615f9a6@mail.gmail.com')</div><table summary='diffstat' class='diffstat'>