X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=IkiWiki%2FRender.pm;h=7e3d7886106084f982c89224ecca6f768a9f36b2;hb=0e7a3640aec280eb19330285308af6ad7535627f;hp=8ae0cbd4f64fe4f8b450114dc1cdb1ba0caad400;hpb=6486452e4c94f5699d98d13e25a361435ed3ddeb;p=ikiwiki.git

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 8ae0cbd4f..7e3d78861 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -409,7 +409,7 @@ sub find_del_files ($) {
 	my @del;
 	my @internal_del;
 
-	foreach my $page (keys %pagemtime) {
+	foreach my $page (keys %pagesources) {
 		if (! $pages->{$page}) {
 			if (isinternal($page)) {
 				push @internal_del, $pagesources{$page};
@@ -591,13 +591,23 @@ sub render_dependent ($$$$$$$) {
 	
 	my %lc_changed = map { lc(pagename($_)) => 1 } @changed;
 	my %lc_exists_changed = map { lc(pagename($_)) => 1 } @exists_changed;
+
+	foreach my $p ("templates/page.tmpl", keys %{$depends_simple{""}}) {
+		if ($rendered{$p} || grep { $_ eq $p } @$del) {
+			foreach my $f (@$files) {
+				next if $rendered{$f};
+				render($f, sprintf(gettext("building %s, which depends on %s"), $f, $p));
+			}
+			return 0;
+		}
+	}
 	 
 	foreach my $f (@$files) {
 		next if $rendered{$f};
 		my $p=pagename($f);
 		my $reason = undef;
-	
-		if (exists $depends_simple{$p}) {
+
+		if (exists $depends_simple{$p} && ! defined $reason) {
 			foreach my $d (keys %{$depends_simple{$p}}) {
 				if (($depends_simple{$p}{$d} & $IkiWiki::DEPEND_CONTENT &&
 				     $lc_changed{$d})
@@ -771,13 +781,7 @@ sub refresh () {
 		render_linkers($file);
 	}
 
-	if ($rendered{"templates/page.tmpl"}) {
-		foreach my $f (@$files) {
-			next if $f eq "templates/page.tmpl";
-			render($f, sprintf(gettext("building %s, which depends on %s"), $f, "templates/page.tmpl"));
-		}
-	}
-	elsif (@$changed || @$internal_changed ||
+	if (@$changed || @$internal_changed ||
 	    @$del || @$internal_del || @$internal_new) {
 		1 while render_dependent($files, $new, $internal_new,
 			$del, $internal_del, $internal_changed,