urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid unsightly warning message when evaling broken pagespecs. 

Also improve error message when a pagespec fails to parse.
master
Joey Hess 2008-05-22 13:11:25 -04:00
parent f6f25758a8
commit 5efaed6de6
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
IkiWiki.pm
View File

@ -1262,6 +1262,7 @@ sub pagespec_translate ($) { #{{{
$code=0;
}
no warnings;
return eval 'sub { my $page=shift; '.$code.' }';
} #}}}
@ -1276,7 +1277,7 @@ sub pagespec_match ($$;@) { #{{{
}
my $sub=pagespec_translate($spec);
return IkiWiki::FailReason->new('syntax error') if $@;
return IkiWiki::FailReason->new("syntax error in pagespec \"$spec\"") if $@;
return $sub->($page, @params);
} #}}}

2
debian/changelog vendored
View File

@ -16,6 +16,8 @@ ikiwiki (2.47) UNRELEASED; urgency=low
* Perls older than 5.10 need to use the old method of decoding utf-8 in CGI
values. Neither method will work for all versions of perl, so check
version number at runtime.
* Avoid unsightly warning message when evaling broken pagespecs.
* Improve error message when a pagespec fails to parse.
-- Joey Hess <joeyh@debian.org> Tue, 13 May 2008 12:30:18 -0400