search for: object_find_optional

....ml index 81e70189a..8844d476b 100644 --- a/builder/simplestreams_parser.ml +++ b/builder/simplestreams_parser.ml @@ -28,58 +28,6 @@ let ensure_trailing_slash str = if String.length str > 0 && str.[String.length str - 1] <> '/' then str ^ "/" else str -let object_find_optional key = function - | Yajl_object o -> - (match List.filter (fun (k, _) -> k = key) (Array.to_list o) with - | [(k, v)] -> Some v - | [] -> None - | _ -> error (f_"more than value for the key '%s'") key) - | _ -> error (f_"the value of the key ...

...Floor, Boston, MA 02110-1301 USA. + *) + +open Common_gettext.Gettext +open Common_utils + +open Yajl +open Utils + +open Printf + +let ensure_trailing_slash str = + if String.length str > 0 && str.[String.length str - 1] <> '/' then str ^ "/" + else str + +let object_find_optional key = function + | Yajl_object o -> + (match List.filter (fun (k, _) -> k = key) (Array.to_list o) with + | [(k, v)] -> Some v + | [] -> None + | _ -> error (f_"more than value for the key '%s'") key) + | _ -> error (f_"the value of the key ...

Hi, this series adds a basic support for Simple Streams v1.0 metadata files. This makes it possible to create a repository .conf files with [cirros] uri=http://download.cirros-cloud.net format=simplestreams to read the latest version of each CirrOS image. TODO items: - check the pasted metadata: listing and creating images works, so most of the current metadata is correct - possibly wait

...Floor, Boston, MA 02110-1301 USA. + *) + +open Common_gettext.Gettext +open Common_utils + +open Yajl +open Utils + +open Printf + +let ensure_trailing_slash str = + if String.length str > 0 && str.[String.length str - 1] <> '/' then str ^ "/" + else str + +let object_find_optional key = function + | Yajl_object o -> + (match List.filter (fun (k, _) -> k = key) (Array.to_list o) with + | [(k, v)] -> Some v + | [] -> None + | _ -> error (f_"more than value for the key '%s'") key) + | _ -> error (f_"the value of the key ...

...-21,6 +21,7 @@ open Tools_utils open Common_gettext.Gettext external json_parser_tree_parse : string -> JSON.json_t = "virt_builder_json_parser_tree_parse" +external json_parser_tree_parse_file : string -> JSON.json_t = "virt_builder_json_parser_tree_parse_file" let object_find_optional key = function | JSON.Dict fields -> diff --git a/common/mltools/JSON_parser.mli b/common/mltools/JSON_parser.mli index 5ad0ef017..a62d387cd 100644 --- a/common/mltools/JSON_parser.mli +++ b/common/mltools/JSON_parser.mli @@ -19,6 +19,9 @@ val json_parser_tree_parse : string -> JSON.json_...

..._parser_array of json_parser_val array -| JSON_parser_bool of bool - -external json_parser_tree_parse : string -> json_parser_val = "virt_builder_json_parser_tree_parse" +external json_parser_tree_parse : string -> JSON.json_t = "virt_builder_json_parser_tree_parse" let object_find_optional key = function - | JSON_parser_object o -> - (match List.filter (fun (k, _) -> k = key) (Array.to_list o) with + | JSON.Dict fields -> + (match List.filter (fun (k, _) -> k = key) fields with | [(k, v)] -> Some v | [] -> None | _ -> error (f_"more th...

v2: - Added back the null value. - Reran the tests. Rich.

Hi all, I wanted to provide an easy way to create or update a virt-builder repository out of a folder of template disk image files. This is what virt-builder-repository aims at. Some of the data are computed from the image file, others are asked the user or extracted from an existing index file. So far, virt-builder-repository doesn't run libguestfs on each image to extract the architecture,

...al) array +| JSON_parser_array of json_parser_val array +| JSON_parser_bool of bool -external yajl_tree_parse : string -> yajl_val = "virt_builder_yajl_tree_parse" +external json_parser_tree_parse : string -> json_parser_val = "virt_builder_json_parser_tree_parse" let object_find_optional key = function - | Yajl_object o -> + | JSON_parser_object o -> (match List.filter (fun (k, _) -> k = key) (Array.to_list o) with | [(k, v)] -> Some v | [] -> None @@ -46,27 +46,27 @@ let object_find key yv = let object_get_string key yv = match object_find key...

An evolution of: https://www.redhat.com/archives/libguestfs/2018-August/msg00155.html

Hi, this series adds a basic support for Simple Streams v1.0 metadata files. This makes it possible to create a repository .conf files with [cirros] uri=http://download.cirros-cloud.net format=simplestreams to read the latest version of each CirrOS image. Thanks, Pino Toscano (4): builder: add non-int revisions builder: add simple libyajl binding build: expose HAVE_YAJL to automake

I rethought this again, as I think that it's a dangerous assumption to bake qemu-img measure output into our API. This patch series runs qemu-img measure behind the scenes, but then parses the output and sums it to a single number which we print. Doing that required a bit of reworking, moving the Jansson [JSON parser] bindings from virt-builder into the common directory and a couple of other

Hi, this series adds a basic support for Simple Streams v1.0 metadata files. This makes it possible to create a repository .conf files with [cirros] uri=http://download.cirros-cloud.net format=simplestreams to read the latest version of each CirrOS image. TODO items: - a bit more testing: listing and creating images works, so the current metadata is correct - handle revisions, so newer

...gnature> on the command line. This prevents an attacker from replacing the signed index file with an unsigned index file and having virt-builder diff --git a/builder/yajl.ml b/builder/yajl.ml index e53706abc..d933b5246 100644 --- a/builder/yajl.ml +++ b/builder/yajl.ml @@ -35,23 +35,23 @@ let object_find_optional key = function (match List.filter (fun (k, _) -> k = key) (Array.to_list o) with | [(k, v)] -> Some v | [] -> None - | _ -> error (f_"more than value for the key '%s'") key) - | _ -> error (f_"the value of the key '%s' is not an objec...