search for: s_

...0 files changed, 39 insertions(+), 105 deletions(-) diff --git a/builder/cmdline.ml b/builder/cmdline.ml index 49435ae..1537208 100644 --- a/builder/cmdline.ml +++ b/builder/cmdline.ml @@ -126,8 +126,6 @@ let parse_cmdline () = "--long", Arg.Unit list_set_long, " " ^ s_"Shortcut for --list-format short"; "--list-format", Arg.String list_set_format, "short|long|json" ^ " " ^ s_"Set the format for --list (default: short)"; - "--short-options", Arg.Unit di...

...+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"; - [ "--attach-format" ], Getopt.String ("format", set_attach_format), + [ L"arch" ], G...

...100644 mllib/getopt-c.c > create mode 100644 mllib/getopt.ml > create mode 100644 mllib/getopt.mli > > diff --git a/builder/Makefile.am b/builder/Makefile.am > index ad32940..8c3ba26 100644 > --- a/builder/Makefile.am > +++ b/builder/Makefile.am > @@ -91,6 +91,7 @@ SOURCES_ML = \ > SOURCES_C = \ > ../mllib/dev_t-c.c \ > ../mllib/fsync-c.c \ > + ../mllib/getopt-c.c \ > ../mllib/uri-c.c \ > ../mllib/mkdtemp-c.c \ > ../customize/perl_edit-c.c \ > @@ -137,6 +138,7 @@ BOBJECTS = \ > $(top_builddir)/mllib/guestfs_config.cmo \ > $...

...rtions(+), 337 deletions(-) create mode 100644 mllib/getopt-c.c create mode 100644 mllib/getopt.ml create mode 100644 mllib/getopt.mli diff --git a/builder/Makefile.am b/builder/Makefile.am index ad32940..8c3ba26 100644 --- a/builder/Makefile.am +++ b/builder/Makefile.am @@ -91,6 +91,7 @@ SOURCES_ML = \ SOURCES_C = \ ../mllib/dev_t-c.c \ ../mllib/fsync-c.c \ + ../mllib/getopt-c.c \ ../mllib/uri-c.c \ ../mllib/mkdtemp-c.c \ ../customize/perl_edit-c.c \ @@ -137,6 +138,7 @@ BOBJECTS = \ $(top_builddir)/mllib/guestfs_config.cmo \ $(top_builddir)/mllib/common_gettext.cmo \ $(top_...

...rtions(+), 337 deletions(-) create mode 100644 mllib/getopt-c.c create mode 100644 mllib/getopt.ml create mode 100644 mllib/getopt.mli diff --git a/builder/Makefile.am b/builder/Makefile.am index 5c41cfa..a4691d7 100644 --- a/builder/Makefile.am +++ b/builder/Makefile.am @@ -91,6 +91,7 @@ SOURCES_ML = \ SOURCES_C = \ ../mllib/dev_t-c.c \ ../mllib/fsync-c.c \ + ../mllib/getopt-c.c \ ../mllib/uri-c.c \ ../mllib/mkdtemp-c.c \ ../customize/perl_edit-c.c \ @@ -137,6 +138,7 @@ BOBJECTS = \ $(top_builddir)/mllib/guestfs_config.cmo \ $(top_builddir)/mllib/common_gettext.cmo \ $(top_...

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.

...rtions(+), 387 deletions(-) create mode 100644 mllib/getopt-c.c create mode 100644 mllib/getopt.ml create mode 100644 mllib/getopt.mli diff --git a/builder/Makefile.am b/builder/Makefile.am index 5c41cfa..a4691d7 100644 --- a/builder/Makefile.am +++ b/builder/Makefile.am @@ -91,6 +91,7 @@ SOURCES_ML = \ SOURCES_C = \ ../mllib/dev_t-c.c \ ../mllib/fsync-c.c \ + ../mllib/getopt-c.c \ ../mllib/uri-c.c \ ../mllib/mkdtemp-c.c \ ../customize/perl_edit-c.c \ @@ -137,6 +138,7 @@ BOBJECTS = \ $(top_builddir)/mllib/guestfs_config.cmo \ $(top_builddir)/mllib/common_gettext.cmo \ $(top_...

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.

...12 deletions(-) diff --git a/customize/customize_main.ml b/customize/customize_main.ml index 459e98a..42af3c7 100644 --- a/customize/customize_main.ml +++ b/customize/customize_main.ml @@ -78,7 +78,6 @@ let main () = "format" ^ " " ^ s_"Set attach disk format"; "-c", Arg.Set_string libvirturi, s_"uri" ^ " " ^ s_"Set libvirt URI"; "--connect", Arg.Set_string libvirturi, s_"uri" ^ " " ^ s_"Set libvirt URI"; - "--debug-g...

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

...in let attach_disk s = attach := (!attach_format, s) :: !attach in - let debug_gc = ref false in let domain = ref None in let dryrun = ref false in let files = ref [] in @@ -79,7 +78,7 @@ let main () = "format" ^ " " ^ s_"Set attach disk format"; "-c", Arg.Set_string libvirturi, s_"uri" ^ " " ^ s_"Set libvirt URI"; "--connect", Arg.Set_string libvirturi, s_"uri" ^ " " ^ s_"Set libvirt URI"; - "--debug-g...

From: Nikolay Ivanets <stenavin@gmail.com> This patch adds '--blocksize' command line option for virt-get-kernel tool. This option allows specifying disk sector size as described in 'guestfs_add_drive_opts' libguestfs API. --- get-kernel/get_kernel.ml | 22 ++++++++++++---------- get-kernel/virt-get-kernel.pod | 8 ++++++++ 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/get-kernel/get_kernel.ml b/get-kernel/get_kernel.ml index ab6b2d55e..d29d0ef7f 100644 --...

Make use of the helper provided by Tools_utils.create_standard_options, so there is no need to implement the logic in each tool. This affects all the OCaml tools with --machine-readable, namely: virt-builder, virt-builder-repository, virt-dib, virt-get-kernel, virt-resize, virt-sparsify, and virt-v2v. --- builder/cmdline.ml | 8...

...omain := Some dom - and set_prefix p = - if !prefix <> None then - error (f_"--prefix option can only be given once"); - prefix := Some p in - - let ditto = " -\"-" in - let argspec = [ - "-a", Arg.String set_file, s_"file" ^ " " ^ s_"Add disk image file"; - "--add", Arg.String set_file, s_"file" ^ " " ^ s_"Add disk image file"; - "-c", Arg.Set_string libvirturi, s_"uri" ^ " " ^ s_"...

Some simple refactoring of virt-resize. I originally had the idea that we could turn virt-resize into a library (cf. virt-customize) and use it from virt-builder, but I now don't think that would make any meaningful difference. In particular we'd still have to open the handle the same number of times. These two patches are left over from my work on that. 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 --git a/common/mlstdutils/std_utils.ml b/common/mlstdutils/std_utils.ml index df443058f..6499b3535 100644 --- a/common/mlstdutils/std_utils.ml +++ b/common/mlstdutils/std_utils....

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

...0! In addition: Warning messages: 1: In plot.window(...) : nonfinite axis limits [GScale(-inf,1.31772,2, .); log=1] 2: In axis(side = side, at = at, labels = labels, ...) : CreateAtVector "log"(from axis()): axp[0] = 0 ! My code is as follows: foundOr <- read.table("yahoos_f.txt", sep="," , header=T) if (max(foundOr$s_) >= max(notFoundOr$s_)) maxY = log(max(foundOr$s_)) else maxY = log(max(notFoundOr$s_)) jpeg('clusterYS_.jpg', quality = 100, bg = "white", res = 200, width = 2000, height = 2000 ) plot(foundOr$uid, foundOr$s_, xl...

...6. --- sysprep/main.ml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sysprep/main.ml b/sysprep/main.ml index ea94728..f32c4ad 100644 --- a/sysprep/main.ml +++ b/sysprep/main.ml @@ -140,6 +140,8 @@ let main () = "--list-operations", Arg.Unit list_operations, " " ^ s_"List supported operations"; "--long-options", Arg.Unit display_long_options, " " ^ s_"List long options"; "--mount-options", Arg.Set_string mount_opts, s_"opts" ^ " " ^ s_"Set mount options (eg /:noatime;/var:r...