X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/ecdfd1b8644bc926db008054ab6192e18351afed..773db5a35e5b81fee3f1f8bf48dffc1dd4f3e2fe:/IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 35b38df46..4acc5508a 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -441,6 +441,13 @@ sub getsetup () {
 		safe => 0,
 		rebuild => 0,
 	},
+	wrapper_background_command => {
+		type => "internal",
+		default => '',
+		description => "background shell command to run",
+		safe => 0,
+		rebuild => 0,
+	},
 	gettime => {
 		type => "internal",
 		description => "running in gettime mode",
@@ -872,7 +879,19 @@ sub will_render ($$;$) {
 	# Important security check.
 	if (-e "$config{destdir}/$dest" && ! $config{rebuild} &&
 	    ! grep { $_ eq $dest } (@{$renderedfiles{$page}}, @{$oldrenderedfiles{$page}}, @{$wikistate{editpage}{previews}})) {
-		error("$config{destdir}/$dest independently created, not overwriting with version from $page");
+		my $from_other_page=0;
+		foreach my $p (keys %renderedfiles) {
+			if (grep {
+				$_ eq $dest ||
+				dirname($_) eq $dest
+			    } @{$renderedfiles{$p}}) {
+				$from_other_page=1;
+				last;
+			}
+		}
+
+		error("$config{destdir}/$dest independently created, not overwriting with version from $page")
+			unless $from_other_page;
 	}
 
 	if (! $clear || $cleared{$page}) {