提交 3cdf4dd4 编写于 作者: E Eric Blake

snapshot: improve snapshot-list error message

https://bugzilla.redhat.com/show_bug.cgi?id=869100 mentioned some
confusion about 'virsh snapshot-list' errors.  Clean up a
misleading error message, and add some documentation.

* tools/virsh-snapshot.c (cmdSnapshotList): Mention --current
rather than --from when appropriate.
* tools/virsh.pod (snapshot-list): Mention that the named starting
point is NOT part of the list except under --tree.
上级 caea10bf
...@@ -1197,6 +1197,8 @@ cmdSnapshotList(vshControl *ctl, const vshCmd *cmd) ...@@ -1197,6 +1197,8 @@ cmdSnapshotList(vshControl *ctl, const vshCmd *cmd)
} }
if (from) { if (from) {
vshError(ctl, "%s", vshError(ctl, "%s",
vshCommandOptBool(cmd, "current") ?
_("--roots and --current are mutually exclusive") :
_("--roots and --from are mutually exclusive")); _("--roots and --from are mutually exclusive"));
goto cleanup; goto cleanup;
} }
......
...@@ -2764,7 +2764,9 @@ start at the current snapshot. When used in isolation or with ...@@ -2764,7 +2764,9 @@ start at the current snapshot. When used in isolation or with
I<--parent>, the list is limited to direct children unless I<--parent>, the list is limited to direct children unless
I<--descendants> is also present. When used with I<--tree>, the I<--descendants> is also present. When used with I<--tree>, the
use of I<--descendants> is implied. This option is not compatible use of I<--descendants> is implied. This option is not compatible
with I<--roots>. with I<--roots>. Note that the starting point of I<--from> or
I<--current> is not included in the list unless the I<--tree>
option is also present.
If I<--leaves> is specified, the list will be filtered to just If I<--leaves> is specified, the list will be filtered to just
snapshots that have no children. Likewise, if I<--no-leaves> is snapshots that have no children. Likewise, if I<--no-leaves> is
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册