search for: customize_argspec

...; - "--version", Arg.Unit print_version_and_exit, - " " ^ s_"Display version and exit"; - "-x", Arg.Unit set_trace, " " ^ s_"Enable tracing of libguestfs calls"; ] in let customize_argspec, get_customize_ops = Customize_cmdline.argspec () in let customize_argspec = List.map (fun (spec, _, _) -> spec) customize_argspec in let argspec = argspec @ customize_argspec in - let argspec = - let cmp (arg1, _, _) (arg2, _, _) = - let arg1 = skip_dashes arg1 and arg2 = sk...

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.

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

...+ [ "--no-sync" ], Getopt.Clear sync, s_"Do not fsync output file on exit"; + [ "--no-warn-if-partition" ], Getopt.Clear warn_if_partition, + s_"Do not warn if writing to a partition"; ] in let customize_argspec, get_customize_ops = Customize_cmdline.argspec () in let customize_argspec = List.map (fun (spec, _, _) -> spec) customize_argspec in let argspec = argspec @ customize_argspec in - let argspec = set_standard_options argspec in let args = ref [] in let anon_fun s = push_front...

Make print_version_and_exit, long_options, display_short_options, and display_long_options private, as set_standard_options now takes care of handling the job for the common command line options. --- mllib/common_utils.mli | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/mllib/common_utils.mli b/mllib/common_utils.mli index 79032bc..24f8f83 100644 --- a/mllib/common_utils.mli +++

...nc" ], Getopt.Clear sync, s_"Do not fsync output file on exit"; > + [ "--no-warn-if-partition" ], Getopt.Clear warn_if_partition, > + s_"Do not warn if writing to a partition"; > ] in > let customize_argspec, get_customize_ops = Customize_cmdline.argspec () in > let customize_argspec = > @@ -192,7 +185,7 @@ A short summary of the options is given below. For detailed help please > read the man page virt-builder(1). > ") > prog in > - Arg.parse argspec anon_fun usage_...

...+ [ "--no-sync" ], Getopt.Clear sync, s_"Do not fsync output file on exit"; + [ "--no-warn-if-partition" ], Getopt.Clear warn_if_partition, + s_"Do not warn if writing to a partition"; ] in let customize_argspec, get_customize_ops = Customize_cmdline.argspec () in let customize_argspec = @@ -192,7 +185,7 @@ A short summary of the options is given below. For detailed help please read the man page virt-builder(1). ") prog in - Arg.parse argspec anon_fun usage_msg; + Getopt.parse argspec ~...

...+ [ "--no-sync" ], Getopt.Clear sync, s_"Do not fsync output file on exit"; + [ "--no-warn-if-partition" ], Getopt.Clear warn_if_partition, + s_"Do not warn if writing to a partition"; ] in let customize_argspec, get_customize_ops = Customize_cmdline.argspec () in let customize_argspec = @@ -192,7 +185,7 @@ A short summary of the options is given below. For detailed help please read the man page virt-builder(1). ") prog in - Arg.parse argspec anon_fun usage_msg; + Getopt.parse argspec ~...

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

...^ s_"Display version and exit"; - "-x", Arg.Set trace, " " ^ s_"Enable tracing of libguestfs calls"; + "-x", Arg.Bool set_trace, " " ^ s_"Enable tracing of libguestfs calls"; ] in let customize_argspec, get_customize_ops = Customize_cmdline.argspec () in let customize_argspec = @@ -211,8 +209,6 @@ read the man page virt-builder(1). let smp = !smp in let sources = List.rev !sources in let sync = !sync in - let trace = !trace in - let verbose = !verbose in (* No arguments and mac...

...; + [ L"no-sync" ], Getopt.Clear sync, s_"Do not fsync output file on exit"; + [ L"no-warn-if-partition" ], Getopt.Clear warn_if_partition, s_"Do not warn if writing to a partition"; ] in let customize_argspec, get_customize_ops = Customize_cmdline.argspec () in diff --git a/dib/cmdline.ml b/dib/cmdline.ml index 0ec1616..acba9b4 100644 --- a/dib/cmdline.ml +++ b/dib/cmdline.ml @@ -20,6 +20,7 @@ open Common_gettext.Gettext open Common_utils +open Getopt.OptionName open Utils @@ -151,44 +152,44 @@...

.. and a lot of refactoring. https://bugzilla.redhat.com/show_bug.cgi?id=1167623 Rich.

https://bugzilla.redhat.com/show_bug.cgi?id=1167623

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.

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

There's not going to be an easy way to present this patch. It's huge and interconnected. Anyway, what it does is lay the groundwork for a new tool which I'm calling 'virt-customize'. virt-customize is virt-builder, but without the part where it downloads a template from a respository. Just the part where it customizes the template, that is, installing packages, editing

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.

This time including the first commit ...