Skip to content

Commit 2fd2529

Browse files
sbngrosssgross-emlix
authored andcommitted
remote/client: adapt scp command
Use features of multifile scp driver
1 parent 5b8ae4e commit 2fd2529

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

labgrid/remote/client.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1256,7 +1256,7 @@ def ssh(self):
12561256
def scp(self):
12571257
drv = self._get_ssh()
12581258

1259-
res = drv.scp(src=self.args.src, dst=self.args.dst)
1259+
res = drv.scp(src=self.args.files[:-1], dst=self.args.files[-1], recursive=self.args.recursive)
12601260
if res:
12611261
raise InteractiveCommandError("scp error", res)
12621262

@@ -1922,8 +1922,10 @@ def main():
19221922

19231923
subparser = subparsers.add_parser("scp", help="transfer file via scp")
19241924
subparser.add_argument("--name", "-n", help="optional resource name")
1925-
subparser.add_argument("src", help="source path (use :dir/file for remote side)")
1926-
subparser.add_argument("dst", help="destination path (use :dir/file for remote side)")
1925+
subparser.add_argument("--recursive", "-r", action="store_true", help="copy recursive")
1926+
subparser.add_argument(
1927+
"files", nargs="+", metavar="SRC/DST", help="source and destination path (use :dir/file for remote side)"
1928+
)
19271929
subparser.set_defaults(func=ClientSession.scp)
19281930

19291931
subparser = subparsers.add_parser(

0 commit comments

Comments
 (0)