[Pkg-ocaml-maint-commits] [SCM] dose2 packaging branch, master, updated. debian/1.4.2-1-1-g6f4f567

Ralf Treinen treinen at free.fr
Wed Feb 3 21:20:45 UTC 2010


The following commit has been merged in the master branch:
commit 5c8acf18803b7ee99287c6fe0da7f6a4940ba5d9
Author: Ralf Treinen <treinen at free.fr>
Date:   Tue Jun 16 20:36:55 2009 +0200

    remove all lines referencing lead

diff --git a/ocamlrpm/ocamlrpm_stubs.c b/ocamlrpm/ocamlrpm_stubs.c
index 66da4dd..33fe153 100644
--- a/ocamlrpm/ocamlrpm_stubs.c
+++ b/ocamlrpm/ocamlrpm_stubs.c
@@ -890,9 +890,7 @@ value ocamlrpm_read_package (value locale, value file_name)
 {
 	FD_t fd;
 	Header header;
-#if RPM_FORMAT_VERSION < 5
-	struct rpmlead lead;
-#endif
+
 	CAMLparam2 (locale, file_name);
 	CAMLlocal1 (retval);
 
@@ -900,11 +898,6 @@ value ocamlrpm_read_package (value locale, value file_name)
 	if (!fd)
 		caml_failwith (strerror (errno));
 
-#if RPM_FORMAT_VERSION < 5
-	readLead (fd, &lead);
-	rpmReadSignature (fd, NULL, lead.signature_type);
-	header = headerRead (fd, lead.major >= 3 ? HEADER_MAGIC_YES : HEADER_MAGIC_NO);
-#endif
 	retval = ocamlize_header (header, String_val (locale));	
 	Fclose (fd);
 	CAMLreturn (retval);

-- 
dose2 packaging



More information about the Pkg-ocaml-maint-commits mailing list