From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 9 Oct 2009 17:07:50 +0000 (-0400)
Subject: conditional: use pagespec_match_list
X-Git-Tag: 3.20091017~27^2~44
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/f9f7a6e9f34b120504bb1dc238a3a627e9a8e3dc?hp=769b78df078d0287a10166ce828941a491858ff2

conditional: use pagespec_match_list
---

diff --git a/IkiWiki/Plugin/conditional.pm b/IkiWiki/Plugin/conditional.pm
index bc7b8974d..aad617812 100644
--- a/IkiWiki/Plugin/conditional.pm
+++ b/IkiWiki/Plugin/conditional.pm
@@ -31,8 +31,7 @@ sub preprocess_if (@) {
 	my $result=0;
 	if (! IkiWiki::yesno($params{all}) ||
 	    # An optimisation to avoid needless looping over every page
-	    # and adding of dependencies for simple uses of some of the
-	    # tests.
+	    # for simple uses of some of the tests.
 	    $params{test} =~ /^([\s\!()]*((enabled|sourcepage|destpage|included)\([^)]*\)|(and|or))[\s\!()]*)+$/) {
 		add_depends($params{page}, "($params{test}) and $params{page}");
 		$result=pagespec_match($params{page}, $params{test},
@@ -41,17 +40,12 @@ sub preprocess_if (@) {
 				destpage => $params{destpage});
 	}
 	else {
-		add_depends($params{page}, $params{test});
-
-		foreach my $page (keys %pagesources) {
-			if (pagespec_match($page, $params{test}, 
-					location => $params{page},
-					sourcepage => $params{page},
-					destpage => $params{destpage})) {
-				$result=1;
-				last;
-			}
-		}
+		$result=pagespec_match_list($params{page}, $params{test},
+			# stop after first match
+			num => 1,
+			sourcepage => $params{page},
+			destpage => $params{destpage},
+		);
 	}
 
 	my $ret;