* 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.
master
Joey Hess 2008-02-07 22:11:54 -05:00
parent ed16e5fd9f
commit 63e316f362
2 changed files with 13 additions and 4 deletions

View File

@ -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));
}
}

7
debian/changelog vendored
View File

@ -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 <joeyh@debian.org> Sat, 02 Feb 2008 23:36:31 -0500
-- Joey Hess <joeyh@debian.org> Wed, 06 Feb 2008 15:10:20 -0500
ikiwiki (2.30) unstable; urgency=low