summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Riebenbauer <davrieb@liegesta.at>2010-04-03 21:17:20 +0200
committerDavid Riebenbauer <davrieb@liegesta.at>2010-04-03 22:20:48 +0200
commit628a52a6c49f5d2fc5af251f2d718c8dff5e8ed5 (patch)
treebfa9fa32d423d384e59867ea42c5318da7f5cdde
parenta358d74bef51dae31332ff27e897fe04834571e6 (diff)
Revert "Revert the effects of find_del_files() for (re)autoadded files."
This reverts commit 31680111f0062f07727d14fcf291c98978ad5a2f.
-rw-r--r--IkiWiki.pm3
-rw-r--r--IkiWiki/Render.pm9
2 files changed, 1 insertions, 11 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm
index 56c491339..1770703a5 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -14,8 +14,7 @@ use open qw{:utf8 :std};
use vars qw{%config %links %oldlinks %pagemtime %pagectime %pagecase
%pagestate %wikistate %renderedfiles %oldrenderedfiles
%pagesources %destsources %depends %depends_simple %hooks
- %forcerebuild %loaded_plugins @autofiles %dellinks
- %delrenderedfiles};
+ %forcerebuild %loaded_plugins @autofiles};
use Exporter q{import};
our @EXPORT = qw(hook debug error template htmlpage deptype
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 5b72b6de1..fc71c8919 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -392,9 +392,7 @@ sub find_del_files ($) {
else {
push @del, $pagesources{$page};
}
- $dellinks{$page}= $links{$page};
$links{$page}=[];
- $delrenderedfiles{$page}= $renderedfiles{$page};
$renderedfiles{$page}=[];
$pagemtime{$page}=0;
}
@@ -644,14 +642,8 @@ sub refresh () {
scan($file);
}
- my %del_hash = map {$_, 1} @$del;
while (my $autofile = shift (@autofiles)) {
my $page=pagename($autofile);
- if (exists $del_hash{$page}) {
- $links{$page}= $dellinks{$page};
- $renderedfiles{$page}= $delrenderedfiles{$page};
- delete $del_hash{$page};
- }
if ($pages->{$page}) {
debug(sprintf(gettext("%s has multiple possible source pages"), $page));
}
@@ -663,7 +655,6 @@ sub refresh () {
scan($autofile);
}
- $del = [keys %del_hash];
calculate_links();