From: Richard Jones <rjones@redhat.com>
Date: Thu, 22 Jul 2010 09:59:43 +0000 (+0100)
Subject: generator: Make documentation inside guestfish match man page.
X-Git-Tag: 1.5.2~5
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=2a286f16215ebfac88a32d259f2b68191eb8d27e;p=libguestfs.git

generator: Make documentation inside guestfish match man page.
---

diff --git a/src/generator.ml b/src/generator.ml
index 71421bc..69f561c 100755
--- a/src/generator.ml
+++ b/src/generator.ml
@@ -7773,10 +7773,17 @@ and generate_fish_cmds () =
               name2 (String.concat " " (List.map name_of_argt args)) in
 
       let warnings =
-        if List.mem ProtocolLimitWarning flags then
-          ("\n\n" ^ protocol_limit_warning)
+        if List.exists (function Key _ -> true | _ -> false) (snd style) then
+          "\n\nThis command has one or more key or passphrase parameters.
+Guestfish will prompt for these separately."
         else "" in
 
+      let warnings =
+        warnings ^
+          if List.mem ProtocolLimitWarning flags then
+            ("\n\n" ^ protocol_limit_warning)
+          else "" in
+
       (* For DangerWillRobinson commands, we should probably have
        * guestfish prompt before allowing you to use them (especially
        * in interactive mode). XXX