]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/blobdiff - IkiWiki/Plugin/rst.pm
post for Don
[git.ikiwiki.info.git] / IkiWiki / Plugin / rst.pm
index 08ac15e43fb419b05e2a5d718c266b44c7bb4a50..1fd13d1f5ceca92262cbbfb70d86e979c9ff7d88 100644 (file)
@@ -36,7 +36,7 @@ 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 (@) { #{{{
@@ -44,16 +44,17 @@ sub htmlize (@) { #{{{
        my $content=$params{content};
 
        my $tries=10;
+       my $pid;
        while (1) {
                eval {
                        # Try to call python and run our command
-                       open2(*IN, *OUT, "python", "-c",  $pyCmnd)
+                       $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: $@");
+                       debug("failed to run python to convert rst: $@");
                        return $content;
                }
        }
@@ -63,8 +64,13 @@ sub htmlize (@) { #{{{
        
        print OUT $content;
        close OUT;
+
        local $/ = undef;
-       return <IN>;
+       my $ret=<IN>;
+       close IN;
+       waitpid $pid, 0;
+
+       return $ret;
 } # }}}
 
 1