similar to: [PATCH] builder: remove unused variables

Simple JSON output for sources and templates, to be able to query them with no need to parse unstructured outputs like the "--list-format long" one. --- builder/cmdline.ml | 3 +- builder/list_entries.ml | 60 +++++++++++++++++++++++++++++++++++ builder/list_entries.mli | 2 +- builder/test-virt-builder-list.sh | 67

Move the index and entry definitions in an own Index module, together with the (previously internal to Index_parser) print_entry debugging function. --- builder/Makefile.am | 2 + builder/builder.ml | 36 +++++++-------- builder/index.ml | 117 +++++++++++++++++++++++++++++++++++++++++++++++ builder/index.mli | 41 +++++++++++++++++ builder/index_parser.ml | 96

--- builder/builder.ml | 12 ++++++++++++ builder/index_parser.ml | 16 ++++++++++++++++ builder/index_parser.mli | 4 ++++ builder/list_entries.ml | 17 +++++++++++++++++ builder/virt-builder.pod | 8 ++++++++ 5 files changed, 57 insertions(+) diff --git a/builder/builder.ml b/builder/builder.ml index a0ef6d7..c317816 100644 --- a/builder/builder.ml +++ b/builder/builder.ml @@ -192,6

Store them directly in List_entries, an adding helper function to convert from string. Also use Getopt.Symbol for them, so there is no need to manually reject invalid formats. --- builder/cmdline.ml | 21 +++++++++++---------- builder/cmdline.mli | 2 +- builder/list_entries.ml | 19 ++++++++++++++++--- builder/list_entries.mli | 16 +++++++++++++++- 4 files changed, 43

Output all the translations available for the notes in the "verbose" output and the JSON output, while trying to match the system langauge in the "show notes" output. The JSON output is slightly changed to handle translations, with the "untranslated" notes being matched as "C". The version is not bumped though, since there have been no stable releases with

Introduce a mandatory arch= key in all the entries of index files, to identify which architecture is each. Adapt the long and JSON list outputs to print also this new field. This introduces an incompatibility with index files created with virt-builder < 1.26, as they will be rejected until entries will have the arch= key added (which is ignored by older virt-builder, so adding it will not

Hi, This small patch serie adds a JSON output for virt-builder. This way it is possible to parse the list of available templates, with no need to parse the unstructured and possibly changing short and long outputs of virt-builder. Pino Toscano (3): builder: small refactor of the list output builder: add --list-format builder: add a JSON output for --list builder/builder.ml

Switch the internal storage for the notes of each entry to a sorted list with all the subkeys available (which should represent the translations to various languages). The current outputs are the same (i.e. still the untranslated notes), so this is just internal refactoring/preparation. --- builder/builder.ml | 4 ++-- builder/index_parser.ml | 19 +++++++++++++++----

Change Index.arch to the type (Arch of string | GuessedArch of string). In a future commit, the index parser will allow arch not to be set for some cases. Thus arch value will be guessed by inspecting the image. However we need to distinguish between a set value and a guessed one. Using this new type will help it: match arch with | Arch s -> (* This is a set value *) |

Change Index.arch to the type (Arch of string | GuessedArch of string). In a future commit, the index parser will allow arch not to be set for some cases. Thus arch value will be guessed by inspecting the image. However we need to distinguish between a set value and a guessed one. Using this new type will help it: match arch with | Arch s -> (* This is a set value *) |

In a future commit, the index parser will allow arch not to be set for some cases. In such cases, it will be guessed by inspecting the image, but we need to distinguish between a set value and a guessed one. Using the '(string, string option) maybe' type will help it: match arch with | Either s -> (* This is a set value *) | Or Some s -> (* This is a guessed value *)

Inspired by ocaml-extlib, introduce a module for handling option types. We already had the ‘may’ function (which becomes ‘Option.may’). This adds also ‘Option.map’ (unused), and ‘Option.default’ functions. Note this does *not* introduce the unsafe ‘Option.get’ function from extlib. --- builder/builder.ml | 6 ++--- builder/index.ml | 27 +++++++++------------

Mostly code motion, no behaviour changes. --- builder/Makefile.am | 3 +++ builder/languages.ml | 57 +++++++++++++++++++++++++++++++++++++++++++++++++ builder/languages.mli | 21 ++++++++++++++++++ builder/list_entries.ml | 36 ++----------------------------- 4 files changed, 83 insertions(+), 34 deletions(-) create mode 100644 builder/languages.ml create mode 100644

Instead of passing the (uri, key, proxy) tuple around, pass the whole Sources.source record; this requires creating proper Sources.source also for uri+fingerprint passed via command line. No functional changes. --- builder/Makefile.am | 2 +- builder/builder.ml | 17 +++++++++-------- builder/index_parser.ml | 14 +++++++------- builder/index_parser.mli | 2 +-

If you have a struct containing ?field?, eg: type t = { field : int } then previously to pattern-match on this type, eg. in function parameters, you had to write: let f { field = field } = (* ... use field ... *) In OCaml >= 3.12 it is possible to abbreviate cases where the field being matched and the variable being bound have the same name, so now you can just write: let f {

Switch to the JSON OCaml module for JSON output. The resulting output is the same, except from an indentation level more within lists. --- builder/Makefile.am | 1 + builder/list_entries.ml | 138 +++++++++++++++----------------------- builder/test-virt-builder-list.sh | 134 ++++++++++++++++++------------------ 3 files changed, 123 insertions(+), 150 deletions(-) diff

No functional change, just code motion. --- builder/builder.ml | 6 +++--- builder/list_entries.ml | 12 ++++++------ builder/list_entries.mli | 2 +- builder/sigchecker.ml | 5 ----- builder/sigchecker.mli | 7 +------ builder/utils.ml | 5 +++++ 6 files changed, 16 insertions(+), 21 deletions(-) diff --git a/builder/builder.ml b/builder/builder.ml index

On error, point also to the man page of the current tool in addition to '$TOOL --help'. --- mllib/getopt-c.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mllib/getopt-c.c b/mllib/getopt-c.c index bf40f91..3efd5d3 100644 --- a/mllib/getopt-c.c +++ b/mllib/getopt-c.c @@ -69,8 +69,8 @@ cleanup_option_list (void *ptr) static void __attribute__((noreturn))

Add the possibility to choose which architecture use to build the wanted image (--arch). Since this implies that running commands on the guest is usually not possible when the architecture is different than the host one, another new option (--allow-foreign-arch-ops) allows to run commands nevertheless. The caching scheme is adapted to account for the architecture (with --print-cache showing the

The 'may' function is a higher-order function (HOF) that replaces: match x with | None -> () | Some x -> f x with: may f x The idea comes from lablgtk (OCaml Gtk bindings) where it is widely used. If this change is clearer than previous code, then this could be used in many more places. However I previously steered clear from using HOFs like this because they can be