* Make testpagespec more robust, including checking for missing/bad

  parameters, and detecting if a pagespec failed to compile.

diff --git a/IkiWiki/Plugin/testpagespec.pm b/IkiWiki/Plugin/testpagespec.pm
index 4966f4e10b1a01d441cb45a4fb75205edaf4fe74..a0bb2ff3128e4f9a5d3853f5006aa0d76a074004 100644 (file)
--- a/IkiWiki/Plugin/testpagespec.pm
+++ b/IkiWiki/Plugin/testpagespec.pm
@@ -12,6 +12,12 @@ sub import { #{{{
 sub preprocess (@) { #{{{
        my %params=@_;
        
+       foreach my $param (qw{match pagespec}) {
+               if (! exists $params{$param}) {
+                       return "[[testpagespec missing $param parameter]]";
+               }
+       }
+
        add_depends($params{page}, $params{pagespec});
        
        my $ret=pagespec_match($params{match}, $params{pagespec}, 
@@ -19,6 +25,9 @@ sub preprocess (@) { #{{{
        if ($ret) {
                return "match: $ret";
        }
+       elsif (! defined $ret) {
+               return "match failed: $@";
+       }
        else {
                return "no match: $ret";
        }

diff --git a/debian/changelog b/debian/changelog
index 25d36abc54781e61591d692b5f48c570b10ae732..7da9b9c660f30b4e7a7feda11a20ddd5eae178d7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,10 @@ ikiwiki (2.1) UNRELEASED; urgency=low
   * Fix a bug that prevented clearing email or subscriptions.
   * Improve handling of edits of locked pages by users who are not yet signed
     in.
+  * Make testpagespec more robust, including checking for missing/bad
+    parameters, and detecting if a pagespec failed to compile.
 
- -- Joey Hess <joeyh@debian.org>  Mon, 07 May 2007 02:02:53 -0400
+ -- Joey Hess <joeyh@debian.org>  Tue, 08 May 2007 17:21:13 -0400
 
 ikiwiki (2.00) unstable; urgency=low