X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/5e236f5d25b68f5fb4a421b24470419c6042cb1c..37ec6a82433aa1d7030bca7cae9d3813a6bdbd1f:/IkiWiki.pm?ds=sidebyside

diff --git a/IkiWiki.pm b/IkiWiki.pm
index c787612e1..daa71059b 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -38,7 +38,6 @@ our $DEPEND_LINKS=4;
 use Memoize;
 memoize("abs2rel");
 memoize("pagespec_translate");
-memoize("file_pruned");
 memoize("template_file");
 
 sub getsetup () {
@@ -1876,7 +1875,9 @@ sub use_pagespec ($$;@) {
 		foreach my $i (keys %i) {
 			$depends_simple{$page}{lc $i} |= $i{$i};
 		}
-		error(sprintf(gettext("cannot match pages: %s"), $firstfail));
+
+		error(sprintf(gettext("cannot match pages: %s"), $firstfail))
+			if $firstfail->isa("IkiWiki::ErrorReason");
 	}
 
 	return @ret;
@@ -1898,14 +1899,18 @@ sub deptype (@) {
 	return $deptype;
 }
 
-sub file_pruned ($$) {
-	require File::Spec;
-	my $file=File::Spec->canonpath(shift);
-	my $base=File::Spec->canonpath(shift);
-	$file =~ s#^\Q$base\E/+##;
+sub file_pruned ($;$) {
+	my $file=shift;
+	if (@_) {
+		require File::Spec;
+		$file=File::Spec->canonpath($file);
+		my $base=File::Spec->canonpath(shift);
+		return if $file eq $base;
+		$file =~ s#^\Q$base\E/+##;
+	}
 
 	my $regexp='('.join('|', @{$config{wiki_file_prune_regexps}}).')';
-	return $file =~ m/$regexp/ && $file ne $base;
+	return $file =~ m/$regexp/;
 }
 
 sub define_gettext () {