Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 8a6340f58c4f1ec5a6b77587672e0721f0f250c7..7b54caf99cd41ea4f38a6c9e1b5619350d70caad 100644 (file)
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -95,7 +95,7 @@ EOF
        
        #translators: The first parameter is a filename, and the second is
        #translators: a (probably not translated) error message.
-       open(OUT, ">$wrapper.c") || error(sprintf(gettext("failed to write %s: %s"), "$wrapper.c", $!));;
+       open(OUT, ">$wrapper.c") || error(sprintf(gettext("failed to write %s: %s"), "$wrapper.c", $!));
        print OUT <<"EOF";
 /* A wrapper for ikiwiki, can be safely made suid. */
 #include <stdio.h>

diff --git a/pm_filter b/pm_filter
index 71f26fae8cfad62002bd304700460a02ac27c6df..4984f32d906eae416001dad7f29baab986c0d8c2 100755 (executable)
--- a/pm_filter
+++ b/pm_filter
@@ -14,7 +14,7 @@ elsif (/VERSION_AUTOREPLACE/) {
 }
 elsif (/^use lib/) {
        # The idea here is to figure out if the libdir the Makefile.PL
-       # was configure to use is in perl's normal search path.
+       # was configured to use is in perl's normal search path.
        # If not, hard code it into ikiwiki.
        if ((grep { $_ eq $libdir } @INC) &&
             (! exists $ENV{PERL5LIB} || ! length $ENV{PERL5LIB} ||