web commit from 217.16.16.218: poll vote (Accept both)

[ikiwiki.git] / IkiWiki / Setup.pm

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index 0c8ad9208d50768d8f2eb37473ddc2f5d85187f4..2d6e1d1cffe082315e3f64493c570e86c7d39649 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;
@@ -19,6 +23,7 @@ sub setup () { # {{{
 
        eval $code;
        error($@) if $@;
+
        exit;
 } #}}}