improved fix for depends_simple_mixup

[git.ikiwiki.info.git] / IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 0791e1e755911ef4659bd2b509abde467e99a426..509f9ba2e721be581f65c9b5fbf5b0960b4f42c1 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1818,10 +1818,12 @@ sub add_depends ($$;$) {
        foreach my $p (keys %pagesources) {
                my $r=$sub->($p, location => $page);
                my $i=$r->influences;
        foreach my $p (keys %pagesources) {
                my $r=$sub->($p, location => $page);
                my $i=$r->influences;

+               my $static=$r->influences_static;

                foreach my $k (keys %$i) {
                foreach my $k (keys %$i) {

+                       next unless $r || $static || $k eq $page;

                        $depends_simple{$page}{lc $k} |= $i->{$k};
                }
                        $depends_simple{$page}{lc $k} |= $i->{$k};
                }

-               last if $r->influences_static;
+               last if $static;

        }
 
        $depends{$page}{$pagespec} |= $deptype;
        }
 
        $depends{$page}{$pagespec} |= $deptype;


@@ -2136,6 +2138,9 @@ sub pagespec_match_list ($$;@) {
                my $r=$sub->($p, %params, location => $page);
                error(sprintf(gettext("cannot match pages: %s"), $r))
                        if $r->isa("IkiWiki::ErrorReason");
                my $r=$sub->($p, %params, location => $page);
                error(sprintf(gettext("cannot match pages: %s"), $r))
                        if $r->isa("IkiWiki::ErrorReason");

+               unless ($r) {
+                       $r->remove_influence($p);
+               }

                $accum |= $r;
                if ($r) {
                        push @matches, $p;
                $accum |= $r;
                if ($r) {
                        push @matches, $p;


@@ -2232,6 +2237,13 @@ sub merge_influences {
        }
 }
 
        }
 }
 

+sub remove_influence {
+       my $this=shift;
+       my $torm=shift;
+
+       delete $this->[1]{$torm};
+}
+

 package IkiWiki::ErrorReason;
 
 our @ISA = 'IkiWiki::FailReason';
 package IkiWiki::ErrorReason;
 
 our @ISA = 'IkiWiki::FailReason';