Skip to content

Commit 5fb776c

Browse files
committed
Or this shit?
1 parent 36ede3f commit 5fb776c

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

src/source_repo/svn.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,8 @@ def _build_cli_commands(ctx: Context) -> dict:
168168
# New Subversion server
169169
# New TLS cert on a server
170170
# However, it needs to be checked for on every job)
171-
ctx.job["config"]["expect"] = tuple("accept (p)ermanently", "p")
171+
ctx.job["config"]["expect"]["prompt"] = "accept (p)ermanently"
172+
ctx.job["config"]["expect"]["response"] = "p"
172173

173174
# Trusting the TLS cert requires interactive mode
174175
cmd_svn_info += arg_svn_force_interactive
@@ -353,7 +354,8 @@ def _test_connection_and_credentials(ctx: Context, commands: dict) -> bool:
353354
job_config = ctx.job.get("config",{})
354355
max_retries = job_config.get("max_retries")
355356
password = job_config.get("password")
356-
expect_tuple = job_config.get("expect")
357+
expect = job_config.get("expect", {}).get("prompt","")
358+
response = job_config.get("expect", {}).get("response","")
357359
cmd_svn_info = commands["cmd_svn_info"]
358360
tries_attempted = 1
359361

@@ -362,8 +364,8 @@ def _test_connection_and_credentials(ctx: Context, commands: dict) -> bool:
362364
test = cmd.run_pexpect(
363365
ctx,
364366
args = cmd_svn_info,
365-
expect = expect_tuple[0],
366-
response = expect_tuple[1]
367+
expect = expect,
368+
response = response
367369
)
368370

369371
log(ctx, "test:", "debug", {"test": test})

0 commit comments

Comments
 (0)