[Gzz-commits] alph alph/util/dscutil.py org/nongnu/alph/impl/...

[Benja Fallenstein]

CVSROOT:        /cvsroot/alph
Module name:    alph
Changes by:     Benja Fallenstein <address@hidden>      03/04/22 10:52:45

Modified files:
        alph/util      : dscutil.py 
        org/nongnu/alph/impl: PageImageScroll.java stormalph.test 

Log message:
        Fix tricky bug: Prevent BlockFile from getting garbage collected
        (when gc'ed, it deletes the temporary file, possibly just
        before or while ghostscript is processing it)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/alph/util/dscutil.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/impl/PageImageScroll.java.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/impl/stormalph.test.diff?tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: alph/alph/util/dscutil.py
diff -u alph/alph/util/dscutil.py:1.2 alph/alph/util/dscutil.py:1.3
--- alph/alph/util/dscutil.py:1.2       Tue Apr 22 07:09:07 2003
+++ alph/alph/util/dscutil.py   Tue Apr 22 10:52:45 2003
@@ -16,7 +16,9 @@
 
     cmdline = cmdline % locals()
 
+    print 'cmdline -- ', cmdline
     result = os.system(cmdline)
+    print 'result -- ', result
     if result: return 0
 
     return 1
Index: alph/org/nongnu/alph/impl/PageImageScroll.java
diff -u alph/org/nongnu/alph/impl/PageImageScroll.java:1.11 
alph/org/nongnu/alph/impl/PageImageScroll.java:1.12
--- alph/org/nongnu/alph/impl/PageImageScroll.java:1.11 Tue Apr 22 09:06:30 2003
+++ alph/org/nongnu/alph/impl/PageImageScroll.java      Tue Apr 22 10:52:45 2003
@@ -42,7 +42,7 @@
  */
 
 public class PageImageScroll extends AbstractScrollBlock implements 
PageScrollBlock{
-String rcsid = "$Id: PageImageScroll.java,v 1.11 2003/04/22 13:06:30 tjl Exp 
$";
+String rcsid = "$Id: PageImageScroll.java,v 1.12 2003/04/22 14:52:45 benja Exp 
$";
     public static boolean dbg = true;
     final static void pa(String s) { System.out.println(s); }
 
@@ -78,10 +78,12 @@
        } catch(Exception e) {
            throw new Error(""+e);
        }
+       BlockFile blockfile = alph.getBlockFile(this);
        PyObject res = conv1.__call__(new PyObject[] {
-           new PyString(alph.getBlockFile(this).getFilename()),
+           new PyString(blockfile.getFilename()),
            new PyString(dsc.getPath()),
        });
+       blockfile.close();
        if(! res.__nonzero__())
            throw new Error("Couldn't generate .dsc");
 
Index: alph/org/nongnu/alph/impl/stormalph.test
diff -u alph/org/nongnu/alph/impl/stormalph.test:1.5 
alph/org/nongnu/alph/impl/stormalph.test:1.6
--- alph/org/nongnu/alph/impl/stormalph.test:1.5        Tue Apr 22 09:06:30 2003
+++ alph/org/nongnu/alph/impl/stormalph.test    Tue Apr 22 10:52:45 2003
@@ -3,6 +3,8 @@
 import java
 import alph
 
+#from alph.util.dscutil import *
+
 storm = org.nongnu.storm
 
 string = """Where Alph, the sacred river, ran