diff options
| author | ivan <ivan> | 2008-06-02 02:45:57 +0000 | 
|---|---|---|
| committer | ivan <ivan> | 2008-06-02 02:45:57 +0000 | 
| commit | e449c655c8748e6375eda59d53fdbbf1434eb05b (patch) | |
| tree | 6e99caa6fc9bb7cb2c11a182b4c9b5109bfa308c | |
| parent | b3e51a066b7443d78497e226ef7ecd6f32bed5d8 (diff) | |
yow, don't want everything to waitt until the timeout
| -rw-r--r-- | FS/FS/Misc.pm | 13 | 
1 files changed, 9 insertions, 4 deletions
diff --git a/FS/FS/Misc.pm b/FS/FS/Misc.pm index 5817471be..d57cb3a59 100644 --- a/FS/FS/Misc.pm +++ b/FS/FS/Misc.pm @@ -18,7 +18,7 @@ use IPC::Run3; # for do_print... should just use IPC::Run i guess                   generate_ps generate_pdf do_print                 ); -$DEBUG = 0; +$DEBUG = 1;  =head1 NAME @@ -587,7 +587,8 @@ sub _pslatex {    #my $sfile = shell_quote $file;    my @cmd = ( -    'latex', '-interaction=batchmode', +    'latex', +    #'-interaction=errorstopmode',      '\AtBeginDocument{\RequirePackage{pslatex}}',      '\def\PSLATEXTMP{\futurelet\PSLATEXTMP\PSLATEXTMPB}',      '\def\PSLATEXTMPB{\ifx\PSLATEXTMP\nonstopmode\else\input\fi}', @@ -595,11 +596,15 @@ sub _pslatex {      "$file.tex"    ); -  my $timeout = 60; #? +  my $timeout = 30; #? should be more than enough    for ( 1, 2 ) { -    run( \@cmd, '>'=>'/dev/null', '2>'=>'/dev/null', timeout($timeout) ) + +    local($SIG{CHLD}) = sub {}; +    #run( \@cmd, '>'=>'/dev/null', '2>'=>'/dev/null', timeout($timeout) ) +    run( \@cmd, timeout($timeout) )        or die "pslatex $file.tex failed; see $file.log for details?\n"; +    }  }  | 
