summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>2009-08-28 15:28:52 +0100
committerSimon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>2009-08-28 15:42:07 +0100
commit20a38fbf6d4fda7d811239ae2980a166bc32ad0d (patch)
treee053729b1186dd01b0fd69920e5f9bd96e806f59
parent2a7f3b91d4fa46a67d04f963785f957563ac0cfc (diff)
Avoid duplicating debug message for building a page due to a dependency
As per Joey's review
-rw-r--r--IkiWiki/Render.pm25
1 files changed, 14 insertions, 11 deletions
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 5367b1309..85ae0f8e9 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -460,23 +460,22 @@ sub refresh () {
my %lcchanged = map { lc(pagename($_)) => 1 } @changed;
# rebuild dependant pages
- F: foreach my $f (@$files) {
+ foreach my $f (@$files) {
next if $rendered{$f};
my $p=pagename($f);
+ my $reason = undef;
if (exists $depends_exact{$p}) {
foreach my $d (keys %{$depends_exact{$p}}) {
if (exists $lcchanged{$d}) {
- debug(sprintf(gettext("building %s, which depends on %s"), $f, $d));
- render($f);
- $rendered{$f}=1;
- next F;
+ $reason = $d;
+ last;
}
}
}
- if (exists $depends{$p}) {
- foreach my $d (keys %{$depends{$p}}) {
+ if (exists $depends{$p} && ! defined $reason) {
+ D: foreach my $d (keys %{$depends{$p}}) {
my $sub=pagespec_translate($d);
next if $@ || ! defined $sub;
@@ -487,14 +486,18 @@ sub refresh () {
next if $file eq $f;
my $page=pagename($file);
if ($sub->($page, location => $p)) {
- debug(sprintf(gettext("building %s, which depends on %s"), $f, $page));
- render($f);
- $rendered{$f}=1;
- next F;
+ $reason = $page;
+ last D;
}
}
}
}
+
+ if (defined $reason) {
+ debug(sprintf(gettext("building %s, which depends on %s"), $f, $reason));
+ render($f);
+ $rendered{$f}=1;
+ }
}
# handle backlinks; if a page has added/removed links,