Merge branch 'master' of ssh://git.ikiwiki.info

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 825c077daa7416483f731cc0e31ed4add4444fab..9d6f636a25c372019eb56075029e820e3d3113a5 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -473,7 +473,8 @@ sub find_new_files ($) {
                        }
                        $pagecase{lc $page}=$page;
                        if (! exists $pagectime{$page}) {
-                               $pagectime{$page}=(srcfile_stat($file))[10];
+                               my $ctime=(srcfile_stat($file, 1))[10];
+                               $pagectime{$page}=$ctime if defined $ctime;
                        }
                }
        }
@@ -533,10 +534,11 @@ sub find_changed ($) {
        my @internal_changed;
        foreach my $file (@$files) {
                my $page=pagename($file);
-               my ($srcfile, @stat)=srcfile_stat($file);
-               if (! exists $pagemtime{$page} ||
-                   $stat[9] > $pagemtime{$page} ||
-                   $forcerebuild{$page}) {
+               my ($srcfile, @stat)=srcfile_stat($file, 1);
+               if (defined $srcfile && 
+                   (! exists $pagemtime{$page} ||
+                    $stat[9] > $pagemtime{$page} ||
+                    $forcerebuild{$page})) {
                        $pagemtime{$page}=$stat[9];
 
                        if (isinternal($page)) {

diff --git a/debian/changelog b/debian/changelog
index 20eca01554a4fe753d632ff31f9bc5e29bd5fde6..d339736911853de0ed42e0a8946db8464d4a4d04 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
 ikiwiki (3.20140917) UNRELEASED; urgency=medium
 
+  [ Simon McVittie ]
   * Build-depend on libmagickcore-6.q16-2-extra | libmagickcore-extra
     so we can thumbnail SVGs in the docwiki
 
+  [ Joey Hess ]
+  * Fix crash that can occur when only_committed_changes is set and a
+    file is deleted from the underlay.
+
  -- Simon McVittie <smcv@debian.org>  Tue, 16 Sep 2014 11:21:16 +0100
 
 ikiwiki (3.20140916) unstable; urgency=low