From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 8 Oct 2009 22:47:48 +0000 (-0400)
Subject: use_pagespec: do not fail with error when unable to match, unless it fails
X-Git-Tag: 3.20091017~27^2~62
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/d5f014449511460d4da22591379b30bd5de86145?ds=inline;hp=--cc

use_pagespec: do not fail with error when unable to match, unless it fails
with an ErrorReason
---

d5f014449511460d4da22591379b30bd5de86145
diff --git a/IkiWiki.pm b/IkiWiki.pm
index c787612e1..c735b26c8 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1876,7 +1876,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;
diff --git a/t/use_pagespec.t b/t/use_pagespec.t
index 7b904075e..92d7977cf 100755
--- a/t/use_pagespec.t
+++ b/t/use_pagespec.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 64;
+use Test::More tests => 10;
 
 BEGIN { use_ok("IkiWiki"); }
 
@@ -24,7 +24,8 @@ is_deeply([use_pagespec("foo", "post/*", sort => "title", num => 50)],
 is_deeply([use_pagespec("foo", "post/*", sort => "title",
                          limit => sub { $_[0] !~ /3/}) ],
 	["post/1", "post/2"]);
-eval { use_pagespec("foo", "beep") };
-ok($@, "fails with error when unable to match anything");
+my $r=eval { use_pagespec("foo", "beep") };
+ok(eval { use_pagespec("foo", "beep") } == 0);
+ok(! $@, "does not fail with error when unable to match anything");
 eval { use_pagespec("foo", "this is not a legal pagespec!") };
 ok($@, "fails with error when pagespec bad");