skip old format index file lines for now

[git.ikiwiki.info.git] / ikiwiki

diff --git a/ikiwiki b/ikiwiki
index 9001c5e2a424b7653a1e9ae0478c83320be16f34..bd905a42688e65eaf5ecd3c91c58cea0bb63bb89 100755 (executable)
--- a/ikiwiki
+++ b/ikiwiki
@@ -324,13 +324,17 @@ sub loadindex () { #{{{
                        push @{$items{$item}}, $val;
                }
 
+               next unless exists $items{src}; # skip bad lines for now
+
                my $page=pagename($items{src}[0]);
-               $pagesources{$page}=$items{src}[0];
-               $oldpagemtime{$page}=$items{mtime}[0];
+               if (! $config{rebuild}) {
+                       $pagesources{$page}=$items{src}[0];
+                       $oldpagemtime{$page}=$items{mtime}[0];
+                       $oldlinks{$page}=[@{$items{link}}];
+                       $links{$page}=[@{$items{link}}];
+                       $renderedfiles{$page}=$items{dest}[0];
+               }
                $pagectime{$page}=$items{ctime}[0];
-               $oldlinks{$page}=[@{$items{link}}];
-               $links{$page}=[@{$items{link}}];
-               $renderedfiles{$page}=$items{dest}[0];
        }
        close IN;
 } #}}}
@@ -473,7 +477,7 @@ sub main () { #{{{
        }
        else {
                lockwiki();
-               loadindex() unless $config{rebuild};
+               loadindex();
                require IkiWiki::Render;
                rcs_update();
                refresh();