X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/6c8cf5dd571662f981227489f7c4652a1a1f10cd..e35eb5a4184c9140e01422d0cb70c39cc1a8b969:/IkiWiki/Setup.pm?ds=sidebyside

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index 63659ce2e..235e93eaf 100644
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -2,20 +2,28 @@
 
 use warnings;
 use strict;
+use IkiWiki;
+use open qw{:utf8 :std};
 
 package IkiWiki;
 
 sub setup () { # {{{
 	my $setup=possibly_foolish_untaint($config{setup});
 	delete $config{setup};
-	open (IN, $setup) || error("read $setup: $!\n");
-	local $/=undef;
-	my $code=<IN>;
+	#translators: The first parameter is a filename, and the second
+	#translators: is a (probably not translated) error message.
+	open (IN, $setup) || error(sprintf(gettext("cannot read %s: %s"), $setup, $!));
+	my $code;
+	{
+		local $/=undef;
+		$code=<IN>;
+	}
 	($code)=$code=~/(.*)/s;
 	close IN;
 
 	eval $code;
-	error($@) if $@;
+	error("$setup: ".$@) if $@;
+
 	exit;
 } #}}}