From: Joey Hess <joey@kodama.kitenet.net>
Date: Sat, 17 Nov 2007 19:06:11 +0000 (-0500)
Subject: * Better error message when a setup file has a syntax error.
X-Git-Tag: 2.13~23
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=466a094928b36d09f09286a3dc059f02a879d355;p=ikiwiki.git

* Better error message when a setup file has a syntax error.
  Closes: #451666
---

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index 2d6e1d1cf..235e93eaf 100644
--- 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 56c7e6484..37e6f7d26 100644
--- 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