[freeside-commits] freeside/FS/FS Misc.pm,1.19.2.5,1.19.2.6

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv9732

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	Misc.pm 
Log Message:
yow, don't want everything to waitt until the timeout

Index: Misc.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Misc.pm,v
retrieving revision 1.19.2.5
retrieving revision 1.19.2.6
diff -u -d -r1.19.2.5 -r1.19.2.6
--- Misc.pm	2 Jun 2008 02:16:20 -0000	1.19.2.5
+++ Misc.pm	2 Jun 2008 02:45:57 -0000	1.19.2.6
@@ -18,7 +18,7 @@
                  generate_ps generate_pdf do_print
                );
 
-$DEBUG = 0;
+$DEBUG = 1;
 
 =head1 NAME
 
@@ -587,7 +587,8 @@
   #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 @@
     "$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";
+
   }
 
 }