Skip to content

Commit e590065

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 4951927 commit e590065

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
@@ -1803,7 +1803,10 @@ def man_add_parser(self, name, **kwargs):
18031803
subparser = subparsers.add_parser("show", help="show a place and related resources")
18041804
subparser.set_defaults(func=ClientSession.print_place)
18051805

1806-
subparser = subparsers.add_parser("create", help="add a new place")
1806+
subparser = subparsers.add_parser(
1807+
"create",
1808+
help="add a new place with the name specified via ``--place`` or the ``LG_PLACE`` environment variable",
1809+
)
18071810
subparser.set_defaults(func=ClientSession.add_place)
18081811

18091812
subparser = subparsers.add_parser("delete", help="delete an existing place")
@@ -1851,7 +1854,10 @@ def man_add_parser(self, name, **kwargs):
18511854
subparser.set_defaults(func=ClientSession.release)
18521855

18531856
subparser = subparsers.add_parser(
1854-
"release-from", help="atomically release a place, but only if locked by a specific user"
1857+
"release-from",
1858+
help="atomically release a place, but only if locked by a specific user",
1859+
epilog="Note that this command returns success as long as the specified user no longer owns the place, "
1860+
"meaning it may be acquired by another user or not at all.",
18551861
)
18561862
subparser.add_argument("acquired", metavar="HOST/USER", help="User and host to match against when releasing")
18571863
subparser.set_defaults(func=ClientSession.release_from)
@@ -1901,7 +1907,7 @@ def man_add_parser(self, name, **kwargs):
19011907
subparser.add_argument("--name", "-n", help="optional resource name")
19021908
subparser.set_defaults(func=ClientSession.fastboot)
19031909

1904-
subparser = subparsers.add_parser("flashscript", help="run flash script")
1910+
subparser = subparsers.add_parser("flashscript", help="Run arbitrary script with arguments to flash device")
19051911
subparser.add_argument("script", help="Flashing script")
19061912
subparser.add_argument("script_args", metavar="ARG", nargs=argparse.REMAINDER, help="script arguments")
19071913
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)