X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/dae0f48e91304afcb6ebe0936360e51b22a56548..ffae58a97865d24796826f4b4ff9da82aef93116:/IkiWiki/Plugin/rst.pm diff --git a/IkiWiki/Plugin/rst.pm b/IkiWiki/Plugin/rst.pm index 1fd13d1f5..1f4c8bf9e 100644 --- a/IkiWiki/Plugin/rst.pm +++ b/IkiWiki/Plugin/rst.pm @@ -18,7 +18,7 @@ package IkiWiki::Plugin::rst; use warnings; use strict; -use IkiWiki; +use IkiWiki 2.00; use IPC::Open2; # Simple python script, maybe it should be implemented using an external script. @@ -43,21 +43,11 @@ sub htmlize (@) { #{{{ my %params=@_; my $content=$params{content}; - my $tries=10; my $pid; - while (1) { - eval { - # Try to call python and run our command - $pid=open2(*IN, *OUT, "python", "-c", $pyCmnd) - or return $content; - }; - last unless $@; - $tries--; - if ($tries < 1) { - debug("failed to run python to convert rst: $@"); - return $content; - } - } + my $sigpipe=0; + $SIG{PIPE}=sub { $sigpipe=1 }; + $pid=open2(*IN, *OUT, "python", "-c", $pyCmnd); + # open2 doesn't respect "use open ':utf8'" binmode (IN, ':utf8'); binmode (OUT, ':utf8'); @@ -70,6 +60,9 @@ sub htmlize (@) { #{{{ close IN; waitpid $pid, 0; + return $content if $sigpipe; + $SIG{PIPE}="DEFAULT"; + return $ret; } # }}}