inline: The optimisation in 2.41 broke nested inlines. Detect those and avoid overopt...

[git.ikiwiki.info.git] / IkiWiki / Setup.pm

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index 40ed788624a16ba5f38413e74be6802f7fb1ad5f..235e93eafa061219e96736787273106ee6a32225 100644 (file)
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -2,13 +2,17 @@
 
 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");
+       #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;
@@ -18,7 +22,7 @@ sub setup () { # {{{
        close IN;
 
        eval $code;
-       error($@) if $@;
+       error("$setup: ".$@) if $@;
 
        exit;
 } #}}}