search for: list_formats

...y checked by the + * Getopt handling of Symbol. *) + list_format := List_entries.list_format_of_string arg in let machine_readable = ref false in @@ -118,6 +116,9 @@ let parse_cmdline () = let sync = ref true in let warn_if_partition = ref true in + let formats = List_entries.list_formats + and formats_string = String.concat "|" List_entries.list_formats in + let argspec = [ [ "--arch" ], Getopt.Set_string ("arch", arch), s_"Set the output architecture"; [ "--attach" ], Getopt.String ("iso", attach_...

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))

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

--- builder/Makefile.am | 1 + builder/builder.ml | 69 +++++++++++++++++++++++++---------------------------- builder/cmdline.ml | 37 ++++++++++++++++++++++++---- builder/cmdline.mli | 44 ++++++++++++++++++++++++++++++++++ 4 files changed, 110 insertions(+), 41 deletions(-) create mode 100644 builder/cmdline.mli diff --git a/builder/Makefile.am b/builder/Makefile.am index 6742822..993cc7b

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

Add a --list-format which allows to choose which in format should be the output of --list. --- builder/cmdline.ml | 11 ++++++++++- builder/virt-builder.pod | 24 +++++++++++++++++++++--- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/builder/cmdline.ml b/builder/cmdline.ml index f199f03..6d6439f 100644 --- a/builder/cmdline.ml +++ b/builder/cmdline.ml @@ -132,6 +132,13 @@

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

Allow the user to specify a template in --list mode, which will be the only result in the resulting output (instead of all the available templates). This makes it easier to find out the details of a specific template. --- builder/builder.ml | 6 ++++++ builder/cmdline.ml | 3 ++- builder/virt-builder.pod | 13 +++++++------ 3 files changed, 15 insertions(+), 7 deletions(-) diff

Add an architecture field for all the entries in each index, so we know which architecture they are (not used right now, but will be in the future). The problematic part here is properly marking with the correct architecture: since we only know the current index on libguestfs.org contains x86_64/amd64 images, entries coming from it are marked that way; images in all the other indexes

...need to use ksprintf. > (* No elements and machine-readable mode? Print some facts. *) > if elements = [] && machine_readable () then ( > - printf "virt-dib\n"; > + machine_readable_printf "virt-dib\n"; > let formats_list = Output_format.list_formats () in > - List.iter (printf "output:%s\n") formats_list; > + List.iter (machine_readable_printf "output:%s\n") formats_list; > exit 0 > ); So this caller would become: match machine_readable (), elements = [] with | None, _ -> () | Some pr, [...

All of the GPG commands we run are compatible with either v1 or v2, so this simply involves looking for either gpg2 or gpg binaries at runtime. --- builder/builder.ml | 10 ++++------ builder/cmdline.ml | 8 +++++++- builder/virt-builder.pod | 7 +++++-- docs/guestfs-building.pod | 2 +- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/builder/builder.ml

All of the GPG commands we run are compatible with either v1 or v2, so this simply involves changing the configure script to find either binary. --- builder/cmdline.ml | 2 +- docs/guestfs-building.pod | 17 ++++++++++++++++- m4/guestfs_progs.m4 | 19 +++++++++++++++++++ mllib/guestfs_config.ml.in | 1 + 4 files changed, 37 insertions(+), 2 deletions(-) diff --git

On Tuesday 11 March 2014 10:09:45 Richard W.M. Jones wrote: > On Mon, Mar 10, 2014 at 02:28:20PM +0100, Pino Toscano wrote: > > 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

Simple code motion, no behaviour changes. --- builder/builder.ml | 46 ++++++++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/builder/builder.ml b/builder/builder.ml index 9c26573..ec9919f 100644 --- a/builder/builder.ml +++ b/builder/builder.ml @@ -75,6 +75,30 @@ let remove_duplicates index = false ) index +(* Look for the

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 +-

...m = !checksum in let python = !python in (* No elements and machine-readable mode? Print some facts. *) - if elements = [] && machine_readable then ( + if elements = [] && machine_readable () then ( printf "virt-dib\n"; let formats_list = Output_format.list_formats () in List.iter (printf "output:%s\n") formats_list; diff --git a/get-kernel/get_kernel.ml b/get-kernel/get_kernel.ml index fca8a06db..f2949da89 100644 --- a/get-kernel/get_kernel.ml +++ b/get-kernel/get_kernel.ml @@ -31,7 +31,6 @@ let parse_cmdline () = let libvirturi = ref &quot...

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

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

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

Store the machine-readable flag globally, just like done for verbose/debug/etc, and enhance create_standard_options to provide --machine-readable automatically. --- common/mlstdutils/std_utils.ml | 4 ++++ common/mlstdutils/std_utils.mli | 7 +++++-- common/mltools/tools_utils.ml | 7 ++++++- common/mltools/tools_utils.mli | 5 ++++- 4 files changed, 19 insertions(+), 4 deletions(-) diff