[Pkg-libvirt-commits] [libguestfs] 17/40: builder: Fix documentation of --list --list-format option (RHBZ#1140547).

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to annotated tag debian/1%1.27.44-1
in repository libguestfs.

commit de3614e0ff67f5a85625946f35af296080cbb6b8
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Thu Sep 11 10:11:09 2014 +0100

    builder: Fix documentation of --list --list-format option (RHBZ#1140547).
    
    Also give an error if users use the incorrect one:
    
    $ virt-builder --list --format json
    virt-builder: virt-builder --list: use '--list-format', not '--format'.
---
 builder/cmdline.ml       | 4 ++++
 builder/virt-builder.pod | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/builder/cmdline.ml b/builder/cmdline.ml
index 122c62b..1242aaa 100644
--- a/builder/cmdline.ml
+++ b/builder/cmdline.ml
@@ -243,6 +243,10 @@ read the man page virt-builder(1).
         exit 1
       )
     | `List ->
+      if format <> None then (
+        eprintf (f_"%s: virt-builder --list: use '--list-format', not '--format'.\n") prog;
+        exit 1
+      );
       (match args with
       | [] -> ""
       | _ ->
diff --git a/builder/virt-builder.pod b/builder/virt-builder.pod
index 02bf181..2e6522a 100644
--- a/builder/virt-builder.pod
+++ b/builder/virt-builder.pod
@@ -307,13 +307,13 @@ alternate home directory:
 
 =item B<--list>
 
-=item B<--list --format> format
+=item B<--list --list-format> format
 
 =item B<--list --long>
 
 List available templates.
 
-It is possible to choose with I<--format> the output format for the list
+It is possible to choose with I<--list-format> the output format for the list
 templates:
 
 =over 4

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git