From 63e316f3621618f3b190da527fbb62ca5dad45d9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 7 Feb 2008 22:11:54 -0500 Subject: * Don't die if running with --getctime and rcs_getctime throws an error. There are several cases (recentchanges files, aggregated files) where some source files are not in revision control. --- IkiWiki/Render.pm | 10 ++++++++-- debian/changelog | 7 +++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index 17b60ee94..26f7de331 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -327,9 +327,15 @@ sub refresh () { #{{{ } $pagecase{lc $page}=$page; if ($config{getctime} && -e "$config{srcdir}/$file") { - $pagectime{$page}=rcs_getctime("$config{srcdir}/$file"); + eval { + my $time=rcs_getctime("$config{srcdir}/$file"); + $pagectime{$page}=$time; + }; + if ($@) { + print STDERR $@; + } } - elsif (! exists $pagectime{$page}) { + if (! exists $pagectime{$page}) { $pagectime{$page}=mtime(srcfile($file)); } } diff --git a/debian/changelog b/debian/changelog index b32c7ad51..c608043f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (2.31) UNRELEASED; urgency=low +ikiwiki (2.31) unstable; urgency=low * Revert preservation of input file modification times in output files, since this leads to too many problems with web caching, especially with @@ -36,8 +36,11 @@ ikiwiki (2.31) UNRELEASED; urgency=low * inline: Add new `allowrss` and `allowatom` config options. These can be used if you want a wiki that doesn't default to generating rss or atom feeds, but that does allow them to be turned on for specific blogs. + * Don't die if running with --getctime and rcs_getctime throws an error. + There are several cases (recentchanges files, aggregated files) + where some source files are not in revision control. - -- Joey Hess Sat, 02 Feb 2008 23:36:31 -0500 + -- Joey Hess Wed, 06 Feb 2008 15:10:20 -0500 ikiwiki (2.30) unstable; urgency=low -- cgit v1.2.3