* 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.

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 17b60ee941dc7b789f81871650c54c7279670d7c..26f7de331b51da64a020ced98cee70d6b16a6e03 100644 (file)
--- 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") {
                        }
                        $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));
                        }
                }
                                $pagectime{$page}=mtime(srcfile($file));
                        }
                }

diff --git a/debian/changelog b/debian/changelog
index b32c7ad51b58b38dcdbe09543a9676d778e30643..c608043f432eb3a6f3b26972c9ac52a55a443b99 100644 (file)
--- 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
 
   * 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.
   * 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
 
 
 ikiwiki (2.30) unstable; urgency=low