* Better error message when a setup file has a syntax error.

  Closes: #451666

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index 2d6e1d1cffe082315e3f64493c570e86c7d39649..235e93eafa061219e96736787273106ee6a32225 100644 (file)
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -22,7 +22,7 @@ sub setup () { # {{{
        close IN;
 
        eval $code;
-       error($@) if $@;
+       error("$setup: ".$@) if $@;
 
        exit;
 } #}}}

diff --git a/debian/changelog b/debian/changelog
index 56c7e64843a9da6a4af671ebd8440425ca84ae09..37e6f7d26d706bac92b293683f63aeb69d96219c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,8 +13,10 @@ ikiwiki (2.13) UNRELEASED; urgency=low
     to let ikiwiki run setgid to that group.
   * ikiwiki-mass-rebuild: Run build with the user in all their groups.
   * Correct markdown in example index page in setup. Closes: #451469
+  * Better error message when a setup file has a syntax error.
+    Closes: #451666
 
- -- Joey Hess <joeyh@debian.org>  Fri, 16 Nov 2007 12:52:40 -0500
+ -- Joey Hess <joeyh@debian.org>  Sat, 17 Nov 2007 14:05:38 -0500
 
 ikiwiki (2.12) unstable; urgency=low