search for: warn_if_partition

Rather complex patch to solve a small user error. Warn if the user is doing something like: virt-builder -o /dev/sdX1 Rich.

...ormat_of_string + * throws on invalid input, as it is already 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"; [ &quot...

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

..." -> None | s -> Some s in let gpg = !gpg in let list_format = !list_format in - let machine_readable = !machine_readable in let memsize = !memsize in let network = !network in let ops = get_customize_ops () in @@ -221,7 +217,7 @@ read the man page virt-builder(1). let warn_if_partition = !warn_if_partition in (* No arguments and machine-readable mode? Print some facts. *) - if args = [] && machine_readable then ( + if args = [] && machine_readable () then ( printf "virt-builder\n"; printf "arch\n"; printf "config-fil...

The second patch is obviously not complete yet - for discussion only. Rich.

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

...eadable_tests /common/mltools/tools_utils_tests /common/mltools/oUnit-* /common/mlutils/.depend diff --git a/builder/cmdline.ml b/builder/cmdline.ml index 9c854ed49..f05aecc76 100644 --- a/builder/cmdline.ml +++ b/builder/cmdline.ml @@ -217,14 +217,16 @@ read the man page virt-builder(1). let warn_if_partition = !warn_if_partition in (* No arguments and machine-readable mode? Print some facts. *) - if args = [] && machine_readable () then ( - printf "virt-builder\n"; - printf "arch\n"; - printf "config-file\n"; - printf "customize\n"; -...

...--git a/builder/cmdline.ml b/builder/cmdline.ml index 846c2e3..49a57ee 100644 --- a/builder/cmdline.ml +++ b/builder/cmdline.ml @@ -20,6 +20,7 @@ open Common_gettext.Gettext open Common_utils +open Getopt.OptionName open Customize_cmdline @@ -119,46 +120,46 @@ let parse_cmdline () = let warn_if_partition = ref true in let argspec = [ - [ "--arch" ], Getopt.Set_string ("arch", arch), s_"Set the output architecture"; - [ "--attach" ], Getopt.String ("iso", attach_disk), s_"Attach data disk/ISO during install"; -...

v1 -> v2: - Further fixes to Getopt int parsing. - Completed the L/S changes. - Fixed the test suite so it passes now. Also we don't need the special-case tests for 64 bit arch. Rich.

Hi, this adds the possibility to select the output for --machine-readable in OCaml tools. The possible choices are: * --machine-readable: to stdout, like before * --machine-readable=file:name-of-file: to the specified file * --machine-readable=stream:stdout: explicitly to stdout * --machine-readable=stream:stderr: explicitly to stderr This makes it possible to add additional output for

v3 -> v4: - Pushed the first patch upstream since it was ACKed. - Prevent use of M except for the special virt-v2v options. - Sort the options after added --help etc. - Make corresponding fixes to the tests. Rich.

v2 -> v3: - Add M variant and test it. Rich.

...> $(top_builddir)/mllib/fsync.cmo \ > $(top_builddir)/mllib/planner.cmo \ > diff --git a/builder/cmdline.ml b/builder/cmdline.ml > index eee8367..7a59ac2 100644 > --- a/builder/cmdline.ml > +++ b/builder/cmdline.ml > @@ -119,54 +119,47 @@ let parse_cmdline () = > let warn_if_partition = ref true in > > let argspec = [ > - "--arch", Arg.Set_string arch, "arch" ^ " " ^ s_"Set the output architecture"; > - "--attach", Arg.String attach_disk, "iso" ^ " " ^ s_"Attach data di...

...$(top_builddir)/mllib/common_utils.cmo \ $(top_builddir)/mllib/fsync.cmo \ $(top_builddir)/mllib/planner.cmo \ diff --git a/builder/cmdline.ml b/builder/cmdline.ml index eee8367..7a59ac2 100644 --- a/builder/cmdline.ml +++ b/builder/cmdline.ml @@ -119,54 +119,47 @@ let parse_cmdline () = let warn_if_partition = ref true in let argspec = [ - "--arch", Arg.Set_string arch, "arch" ^ " " ^ s_"Set the output architecture"; - "--attach", Arg.String attach_disk, "iso" ^ " " ^ s_"Attach data disk/ISO during instal...

...$(top_builddir)/mllib/common_utils.cmo \ $(top_builddir)/mllib/fsync.cmo \ $(top_builddir)/mllib/planner.cmo \ diff --git a/builder/cmdline.ml b/builder/cmdline.ml index 6085b45..462554a 100644 --- a/builder/cmdline.ml +++ b/builder/cmdline.ml @@ -119,54 +119,47 @@ let parse_cmdline () = let warn_if_partition = ref true in let argspec = [ - "--arch", Arg.Set_string arch, "arch" ^ " " ^ s_"Set the output architecture"; - "--attach", Arg.String attach_disk, "iso" ^ " " ^ s_"Attach data disk/ISO during instal...

...$(top_builddir)/mllib/common_utils.cmo \ $(top_builddir)/mllib/fsync.cmo \ $(top_builddir)/mllib/planner.cmo \ diff --git a/builder/cmdline.ml b/builder/cmdline.ml index 6085b45..846c2e3 100644 --- a/builder/cmdline.ml +++ b/builder/cmdline.ml @@ -119,60 +119,52 @@ let parse_cmdline () = let warn_if_partition = ref true in let argspec = [ - "--arch", Arg.Set_string arch, "arch" ^ " " ^ s_"Set the output architecture"; - "--attach", Arg.String attach_disk, "iso" ^ " " ^ s_"Attach data disk/ISO during instal...

v2 -> v3: - Changes to the Curl API suggested by Pino.

v1 -> v2: - Fixed the bug with precedence of if / @. - Add some imperative list operators inspired by Perl, and use those for constructing the Curl arguments, and more. Rich.

v2 -> v3: - Renamed List.assoc_ -> List.assoc_lbl. - Rebased on top of current master branch. Rich.

In Std_utils we already extend Char and String. These commits take it a little further by extending List and adding a new Option submodule. All basically simple refactoring. Rich.