]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Thu, 15 Oct 2009 18:26:22 +0000 (14:26 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Thu, 15 Oct 2009 18:26:22 +0000 (14:26 -0400)
IkiWiki/Plugin/sparkline.pm
t/basewiki_brokenlinks.t

index c1f016ffd0e7055bae3f5ba72f9f04b643285c01..fb4849492eb0e20aad9045bae2d51902885abfb5 100644 (file)
@@ -149,7 +149,7 @@ sub preprocess (@) {
 
                waitpid $pid, 0;
                $SIG{PIPE}="DEFAULT";
-               if ($sigpipe) {
+               if ($sigpipe || ! defined $png) {
                        error gettext("failed to run php");
                }
 
index 2dd95083226fc23f32f389ce203a884e6558ffec..74ddc61c5a8b636a80b5ed24c293ce2c3582c4de 100755 (executable)
@@ -8,7 +8,7 @@ ok(! system("make -s ikiwiki.out"));
 ok(! system("make underlay_install DESTDIR=`pwd`/t/tmp/install PREFIX=/usr >/dev/null"));
 
 foreach my $plugin ("", "listdirectives") {
-       ok(! system("LANG=C perl -I. ./ikiwiki.out -rebuild -plugin brokenlinks ".
+       ok(! system("LC_ALL=C perl -I. ./ikiwiki.out -rebuild -plugin brokenlinks ".
                        # always enabled because pages link to it conditionally,
                        # which brokenlinks cannot handle properly
                        "-plugin smiley ".