search for: corrupt_fil

...x d79c807e4..b6e721a00 100644 --- a/builder/index_parser.ml +++ b/builder/index_parser.ml @@ -25,7 +25,7 @@ open Utils open Printf open Unix -let get_index ~downloader ~sigchecker { Sources.uri; proxy } = +let get_index ~downloader ~sigchecker ?(template = false) { Sources.uri; proxy } = let corrupt_file () = error (f_"The index file downloaded from ‘%s’ is corrupt.\nYou need to ask the supplier of this file to fix it and upload a fixed version.") uri in @@ -99,8 +99,23 @@ let get_index ~downloader ~sigchecker { Sources.uri; proxy } = let arch = try Index....

...x c715ccac7..7f64d0d98 100644 --- a/builder/index_parser.ml +++ b/builder/index_parser.ml @@ -25,7 +25,7 @@ open Utils open Printf open Unix -let get_index ~downloader ~sigchecker { Sources.uri; proxy } = +let get_index ~downloader ~sigchecker ?(template = false) { Sources.uri; proxy } = let corrupt_file () = error (f_"The index file downloaded from ‘%s’ is corrupt.\nYou need to ask the supplier of this file to fix it and upload a fixed version.") uri in @@ -99,8 +99,25 @@ let get_index ~downloader ~sigchecker { Sources.uri; proxy } = let arch = try Either...

...x a4d1e466e..bf1c6a557 100644 --- a/builder/index_parser.ml +++ b/builder/index_parser.ml @@ -25,7 +25,7 @@ open Utils open Printf open Unix -let get_index ~downloader ~sigchecker { Sources.uri; proxy } = +let get_index ~downloader ~sigchecker ?(template = false) { Sources.uri; proxy } = let corrupt_file () = error (f_"The index file downloaded from ‘%s’ is corrupt.\nYou need to ask the supplier of this file to fix it and upload a fixed version.") uri in @@ -99,8 +99,23 @@ let get_index ~downloader ~sigchecker { Sources.uri; proxy } = let arch = try Index....

...dex_parser.ml index fb546831f..02c124df3 100644 --- a/builder/index_parser.ml +++ b/builder/index_parser.ml @@ -25,7 +25,7 @@ open Utils open Printf open Unix -let get_index ~downloader ~sigchecker +let get_index ~downloader ~sigchecker ~template { Sources.uri = uri; proxy = proxy } = let corrupt_file () = error (f_"The index file downloaded from ‘%s’ is corrupt.\nYou need to ask the supplier of this file to fix it and upload a fixed version.") uri @@ -100,8 +100,10 @@ let get_index ~downloader ~sigchecker let arch = try List.assoc ("arch", None)...

...dex_parser.ml index fb546831f..02c124df3 100644 --- a/builder/index_parser.ml +++ b/builder/index_parser.ml @@ -25,7 +25,7 @@ open Utils open Printf open Unix -let get_index ~downloader ~sigchecker +let get_index ~downloader ~sigchecker ~template { Sources.uri = uri; proxy = proxy } = let corrupt_file () = error (f_"The index file downloaded from ‘%s’ is corrupt.\nYou need to ask the supplier of this file to fix it and upload a fixed version.") uri @@ -100,8 +100,10 @@ let get_index ~downloader ~sigchecker let arch = try List.assoc ("arch", None)...

...er.ml index d6a4e2e86..6f611a7f5 100644 --- a/builder/index_parser.ml +++ b/builder/index_parser.ml @@ -25,7 +25,7 @@ open Utils open Printf open Unix -let get_index ~downloader ~sigchecker { Sources.uri; proxy } = +let get_index ~downloader ~sigchecker ~template { Sources.uri; proxy } = let corrupt_file () = error (f_"The index file downloaded from ‘%s’ is corrupt.\nYou need to ask the supplier of this file to fix it and upload a fixed version.") uri in @@ -99,8 +99,10 @@ let get_index ~downloader ~sigchecker { Sources.uri; proxy } = let arch = try List.a...

...;revision", None) fields)) with | Not_found -> Rev_int 1 - | Failure "int_of_string" -> + | Failure _ -> eprintf (f_"%s: cannot parse 'revision' field for '%s'\n") prog n; corrupt_file () in let format = @@ -124,7 +124,7 @@ let get_index ~downloader ~sigchecker | Not_found -> eprintf (f_"%s: no 'size' field for '%s'\n") prog n; corrupt_file () - | Failure "int_of_string" ->...

...rintf (f_"virt-builder: index is corrupt: %s: field '%s[%s]' appears two or more times\n") n field value + | None -> + eprintf (f_"virt-builder: index is corrupt: %s: field '%s' appears two or more times\n") n field); corrupt_file () ); - Hashtbl.add fseen field true + Hashtbl.add fseen hashkey true ) fields ) sections; @@ -162,25 +167,26 @@ let get_index ~prog ~debug ~downloader ~sigchecker source = let entries = List.map ( fun (n, fields) -> +...

On Tuesday 21 January 2014 16:37:20 Richard W.M. Jones wrote: > On Tue, Jan 21, 2014 at 05:18:27PM +0100, Pino Toscano wrote: > > + sv = caml_copy_string (fields->subkey ? fields->subkey : ""); > > > > Store_field (v, 1, sv); > > Heh, sure would be nice if this was an option type :-) > > I believe the following should work: > >

...fseen field then ( + fun (field, subkey, _) -> + let hashkey = (field, subkey) in + if Hashtbl.mem fseen hashkey then ( eprintf (f_"virt-builder: index is corrupt: %s: field '%s' appears two or more times\n") n field; corrupt_file () ); - Hashtbl.add fseen field true + Hashtbl.add fseen hashkey true ) fields ) sections; @@ -162,25 +163,32 @@ let get_index ~prog ~debug ~downloader ~sigchecker source = let entries = List.map ( fun (n, fields) -> +...

Hi there, This is an update of the series. Just to rebase it on top of Rich's latest changes. Cédric Bosdonnat (5): builder: rename docs test script builder: add a template parameter to get_index builder: add Index.write_entry function mllib: add XPath helper xpath_get_nodes() New tool: virt-builder-repository Pino Toscano (1): builder: add simple OCaml osinfo-db reader

Hey there, Here is an update of the series. The changes: * Incorporate Richard's comments. Left out the with_openfile one since that leads to a double close. * Change the ask option return type to string (removing the option) since if the use doesn't input anything we're using the default, and the default is now a mandatory parameter. * Make sure there are items in the

...| None -> () | Some uri -> fp "sig=%s\n" uri @@ -179,6 +182,11 @@ let get_index ~prog ~debug ~downloader ~sigchecker source = with Not_found -> eprintf (f_"virt-builder: no 'file' (URI) entry for '%s'\n") n; corrupt_file () in + let arch = + try List.assoc ("arch", None) fields + with Not_found -> + eprintf (f_"virt-builder: no 'arch' entry for '%s'\n") n; + corrupt_file () in let signature_uri = t...

Hi there! Here is the latest version of the series including Richard's comments. I also reworked the repository_main.ml code to avoid setting an empty entry if not found. Cédric Bosdonnat (3): builder: change arch type to distinguish guesses builder: add a template parameter to get_index New tool: virt-builder-repository .gitignore | 4 +

Hi all, Here is the latest version of the series. Diffs to v10: * Make Index.arch a (string, string option) maybe and use it to guess arch at parse time * Compute the image size at parse time when the template flag is set and the value is missing. * Add virt-repository_main slow test * Other fixes from Richard's comments Cédric Bosdonnat (7): Ignore builder/*.out and *.img

Hi all, Diff to v9 includes the changes requested by Pino. Cédric Bosdonnat (5): builder: rename docs test script builder: add a template parameter to get_index builder: add Index.write_entry function mllib: add XPath helper xpath_get_nodes() New tool: virt-builder-repository Pino Toscano (1): builder: add simple OCaml osinfo-db reader .gitignore

Hi there, Diffs to v8: * Remove the regex to increment the revision: Index_parser.get_entry() only handles integers * Fix Pino's comments Cédric Bosdonnat (6): builder: rename docs test script builder: add a template parameter to get_index builder: add Index.write_entry function mllib: add XPath helper xpath_get_nodes() builder: remove useless fish dependency New tool:

...let get_index ~prog ~debug ~downloader ~sigchecker ~proxy source = @@ -245,6 +253,13 @@ let get_index ~prog ~debug ~downloader ~sigchecker ~proxy source = eprintf (f_"virt-builder: cannot parse 'hidden' field for '%s'\n") n; corrupt_file () in + let aliases = + let l = + try string_nsplit list_separator (List.assoc ("aliases", None) fields) + with Not_found -> [] in + match l with + | [] -> None + | l -> Some l in let ent...

...l b/builder/index_parser.ml index d6a4e2e86..c715ccac7 100644 --- a/builder/index_parser.ml +++ b/builder/index_parser.ml @@ -97,7 +97,7 @@ let get_index ~downloader ~sigchecker { Sources.uri; proxy } = eprintf (f_"%s: no ‘file’ (URI) entry for ‘%s’\n") prog n; corrupt_file () in let arch = - try List.assoc ("arch", None) fields + try Either (List.assoc ("arch", None) fields) with Not_found -> eprintf (f_"%s: no ‘arch’ entry for ‘%s’\n") prog n; corrupt_file ()...

Hi all, Here is the latest iteration on the virt-builder-repository series. Diffs to previous version are: fixing things mentioned by Pino, integrate Pino's osinfo ocaml iterator and adding a check of the mime type to filter potential image files. Cédric Bosdonnat (6): builder: rename docs test script builder: add a template parameter to get_index builder: add Index.write_entry