Merge commit 'upstream/master' into prv/po

[ikiwiki.git] / IkiWiki / Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 08d484847a5eef33235d33cfdc0d7a39fc5cfbbe..da2d7b4ccc1adc480c2acc20f6b5d167a8fc7ff2 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -459,13 +459,17 @@ sub refresh () {
                        next if $rendered{$f};
                        my $p=pagename($f);
                        if (exists $depends{$p}) {
-                               foreach my $d (@{$depends{$p}}) {
+                               foreach my $d (keys %{$depends{$p}}) {
+                                       my $sub=pagespec_translate($d);
+                                       next if $@ || ! defined $sub;
+
                                        # only consider internal files
-                                       # if the page explicitly depends on such files
-                                       foreach my $file (@changed, $d=~/internal\(/ ? @internal : ()) {
-                                               next if $f eq $file;
+                                       # if the page explicitly depends
+                                       # on such files
+                                       foreach my $file (@changed, $d =~ /internal\(/ ? @internal : ()) {
+                                               next if $file eq $f;
                                                my $page=pagename($file);
-                                               if (pagespec_match($page, $d, location => $p)) {
+                                               if ($sub->($page, location => $p)) {
                                                        debug(sprintf(gettext("building %s, which depends on %s"), $f, $page));
                                                        render($f);
                                                        $rendered{$f}=1;