git.annexia.org
/
libguestfs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e67298c
)
generator: Make documentation inside guestfish match man page.
author
Richard Jones
<rjones@redhat.com>
Thu, 22 Jul 2010 09:59:43 +0000
(10:59 +0100)
committer
Richard Jones
<rjones@redhat.com>
Thu, 22 Jul 2010 09:59:43 +0000
(10:59 +0100)
src/generator.ml
patch
|
blob
|
history
diff --git
a/src/generator.ml
b/src/generator.ml
index
71421bc
..
69f561c
100755
(executable)
--- 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 =
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
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
(* For DangerWillRobinson commands, we should probably have
* guestfish prompt before allowing you to use them (especially
* in interactive mode). XXX