]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Avoid duplicating debug message for building a page due to a dependency
authorSimon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Fri, 28 Aug 2009 14:28:52 +0000 (15:28 +0100)
committerSimon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Fri, 28 Aug 2009 14:42:07 +0000 (15:42 +0100)
As per Joey's review

IkiWiki/Render.pm

index 5367b13092f58f45cb92e116caced874fbf4be96..85ae0f8e95df8f6da5fe4968d7998b1dde7bb98c 100644 (file)
@@ -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,