Skip to content

Commit 0999668

Browse files
committed
doc: man: Add some details to subcommands
The subcommands descriptions for create, release-from and flashscript had some extra details in the old rst manpages, not available in the argparse/cli help. Migrate these descriptions into argparse. Signed-off-by: Jonas Rebmann <jre@pengutronix.de>
1 parent 78ad7eb commit 0999668

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

labgrid/remote/client.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1810,7 +1810,10 @@ def man_add_parser(self, name, **kwargs):
18101810
subparser = subparsers.add_parser("show", help="show a place and related resources")
18111811
subparser.set_defaults(func=ClientSession.print_place)
18121812

1813-
subparser = subparsers.add_parser("create", help="add a new place")
1813+
subparser = subparsers.add_parser(
1814+
"create",
1815+
help="add a new place with the name specified via ``--place`` or the ``LG_PLACE`` environment variable",
1816+
)
18141817
subparser.set_defaults(func=ClientSession.add_place)
18151818

18161819
subparser = subparsers.add_parser("delete", help="delete an existing place")
@@ -1858,7 +1861,10 @@ def man_add_parser(self, name, **kwargs):
18581861
subparser.set_defaults(func=ClientSession.release)
18591862

18601863
subparser = subparsers.add_parser(
1861-
"release-from", help="atomically release a place, but only if locked by a specific user"
1864+
"release-from",
1865+
help="atomically release a place, but only if locked by a specific user",
1866+
epilog="Note that this command returns success as long as the specified user no longer owns the place, "
1867+
"meaning it may be acquired by another user or not at all.",
18621868
)
18631869
subparser.add_argument("acquired", metavar="HOST/USER", help="User and host to match against when releasing")
18641870
subparser.set_defaults(func=ClientSession.release_from)
@@ -1908,7 +1914,7 @@ def man_add_parser(self, name, **kwargs):
19081914
subparser.add_argument("--name", "-n", help="optional resource name")
19091915
subparser.set_defaults(func=ClientSession.fastboot)
19101916

1911-
subparser = subparsers.add_parser("flashscript", help="run flash script")
1917+
subparser = subparsers.add_parser("flashscript", help="Run arbitrary script with arguments to flash device")
19121918
subparser.add_argument("script", help="Flashing script")
19131919
subparser.add_argument("script_args", metavar="ARG", nargs=argparse.REMAINDER, help="script arguments")
19141920
subparser.add_argument("--name", "-n", help="optional resource name")

man/labgrid-client.1

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ Log output to FILE
257257
.UNINDENT
258258
.SS labgrid\-client create
259259
.sp
260-
add a new place
260+
add a new place with the name specified via \fB\-\-place\fP or the \fBLG_PLACE\fP environment variable
261261
.INDENT 0.0
262262
.INDENT 3.5
263263
.sp
@@ -401,7 +401,7 @@ optional resource name
401401
.UNINDENT
402402
.SS labgrid\-client flashscript
403403
.sp
404-
run flash script
404+
Run arbitrary script with arguments to flash device
405405
.INDENT 0.0
406406
.INDENT 3.5
407407
.sp
@@ -548,6 +548,8 @@ usage: labgrid\-client release\-from HOST/USER
548548
.B host/user
549549
User and host to match against when releasing
550550
.UNINDENT
551+
.sp
552+
Note that this command returns success as long as the specified user no longer owns the place, meaning it may be acquired by another user or not at all.
551553
.SS labgrid\-client release|unlock
552554
.sp
553555
release a place

0 commit comments

Comments
 (0)