* Patch from HenrikBrixAndersen to fix a broken use of foreach in the

[git.ikiwiki.info.git] / IkiWiki / Plugin / rst.pm
diff --git a/IkiWiki/Plugin/rst.pm b/IkiWiki/Plugin/rst.pm

index 789a70ac752b25c2c7aec04d0c79dd61a66f1775..afd60f6687d5e759321cb42261fb1a48a3241094 100644 (file)
--- a/IkiWiki/Plugin/rst.pm
+++ b/IkiWiki/Plugin/rst.pm
@@ -36,28 +36,18 @@ print html[html.find('<body>')+6:html.find('</body>')].strip();
  ";
  
  sub import { #{{{
-       IkiWiki::hook(type => "htmlize", id => "rst", call => \&htmlize);
+       hook(type => "htmlize", id => "rst", call => \&htmlize);
  } # }}}
  
  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) {
-                       IkiWiki::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;
  } # }}}