Libguestfs - Apr 2012 - [PATCH] sysprep: align the help message

Align the "virt-sysprep --help" output message.

Signed-off-by: Wanlong Gao <gaowanlong at cn.fujitsu.com>
---
 sysprep/sysprep_operation_hostname.ml |    2 +-
 sysprep/sysprep_operation_script.ml   |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sysprep/sysprep_operation_hostname.ml
b/sysprep/sysprep_operation_hostname.ml
index 51f9386..6f52e48 100644
--- a/sysprep/sysprep_operation_hostname.ml
+++ b/sysprep/sysprep_operation_hostname.ml
@@ -59,7 +59,7 @@ parameter.
 If the I<--hostname> parameter is not given, then the hostname is changed
 to C<localhost.localdomain>.";
   extra_args = [
-    ("--hostname", Arg.Set_string hostname, "hostname New
hostname"),
+    ("--hostname", Arg.Set_string hostname, "hostname\tNew
hostname"),
     "\
 Change the hostname.  If not given, defaults to
C<localhost.localdomain>."
   ];
diff --git a/sysprep/sysprep_operation_script.ml
b/sysprep/sysprep_operation_script.ml
index 977d41f..e68468c 100644
--- a/sysprep/sysprep_operation_script.ml
+++ b/sysprep/sysprep_operation_script.ml
@@ -133,7 +133,7 @@ guest's DNS configuration file, but C<rm
/etc/resolv.conf> would
 Normally a temporary mount point for the guest is used, but you
 can choose a specific one by using the I<--scriptdir> parameter.";
   extra_args = [
-    ("--scriptdir", Arg.String set_scriptdir, "dir Mount point
on host"),
+    ("--scriptdir", Arg.String set_scriptdir, "dir\tMount point
on host"),
     "\
 The mount point (an empty directory on the host) used when
 the C<script> operation is enabled and one or more scripts
@@ -143,7 +143,7 @@ B<Note:> C<scriptdir> B<must> be an
absolute path.
 
 If I<--scriptdir> is not specified then a temporary mountpoint
 will be created.";
-    ("--script", Arg.String add_script, "script Script or
program to run on guest"),
+    ("--script", Arg.String add_script, "script\tScript or
program to run on guest"),
     "\
 Run the named C<script> (a shell script or program) against the
 guest.  The script can be any program on the host.  The script's
-- 
1.7.10.rc3

On Wed, Apr 11, 2012 at 10:07:14PM +0800, Wanlong Gao
wrote:
> Align the "virt-sysprep --help" output message.
The problem was actually that Arg.align wasn't called around all of
the parameters, just around the basic set of parameters.  So a change
like:

  let argspec = Arg.align ([
    .. basic args ..
  ] @ extended_args)

would have been more appropriate to fix this.

However I also took the opportunity to make other fixes.  See:

https://github.com/libguestfs/libguestfs/commit/edca57b49e88d179d996652a44f7d6ba5b9ca729
https://github.com/libguestfs/libguestfs/commit/a3d6629a0b54aca6d7b5b38750399b5396cdbf07
https://github.com/libguestfs/libguestfs/commit/16b2ffa97ea8b2872306bc4400605821440f6589
https://github.com/libguestfs/libguestfs/commit/4ee518508fcc084f6d34c1c213b73a3abf13ddac

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
virt-p2v converts physical machines to virtual machines.  Boot with a
live CD or over the network (PXE) and turn machines into Xen guests.
http://et.redhat.com/~rjones/virt-p2v