[Debburn-changes] r779 - cdrkit/trunk/genisoimage

[93sam at alioth.debian.org]

Author: 93sam
Date: 2007-09-19 20:57:53 +0000 (Wed, 19 Sep 2007)
New Revision: 779

Modified:
   cdrkit/trunk/genisoimage/jte.c
Log:
Fix bzip-compressed template output to match what jigdo expects - type
2, "BZIP" rather than type 8, "DATA"


Modified: cdrkit/trunk/genisoimage/jte.c
===================================================================
--- cdrkit/trunk/genisoimage/jte.c	2007-08-06 21:15:15 UTC (rev 778)
+++ cdrkit/trunk/genisoimage/jte.c	2007-09-19 20:57:53 UTC (rev 779)
@@ -641,7 +641,7 @@
     compressed_size_out = c_stream.total_out_lo32 + 16;
     err = BZ2_bzCompressEnd(&c_stream);
 
-    template_fwrite("DATA", 4, 1, t_file);
+    template_fwrite("BZIP", 4, 1, t_file);
 
     write_le48(compressed_size_out, &comp_size_out[0]);
     template_fwrite(comp_size_out, sizeof(comp_size_out), 1, t_file);
@@ -732,12 +732,7 @@
             case JTET_NOMATCH:
             {
                 jigdo_chunk_entry_t jchunk;
-#ifdef BZ2_SUPPORT
-                if (use_bz2)
-                    jchunk.type = 8; /* Raw data, bzipped */
-                else
-#endif
-                    jchunk.type = 2; /* Raw data, gzipped */
+				jchunk.type = 2; /* Raw data, gzipped */
                 write_le48(entry->data.chunk.uncompressed_length, &jchunk.skipLen[0]);
                 template_fwrite(&jchunk, sizeof(jchunk), 1, t_file);
                 break;