Fix git svn init command

Author: marcleblanc2

src/source_repo/svn.py

@@ -156,7 +156,33 @@ def _build_cli_commands(ctx: Context) -> dict:
     arg_repo_url                        = [repo_url]
 
     # svn commands
-    cmd_svn_info                        = ["svn", "info"] + arg_svn_non_interactive + arg_repo_url
+    cmd_svn_info                        = ["svn", "info"] + arg_repo_url
+
+
+    # Skip TLS verification, if needed
+    if disable_tls_verification:
+
+        # This prompt only be required very rarely, ex. once per:
+            # Deployment of the repo-converter container, ex. the ~/.subversion/auth/svn.ssl.server directory inside the container is empty, as the root volume is not retained
+            # New Subversion server
+            # New TLS cert on a server
+        # However, it needs to be checked for on every job
+        expect = []
+        expect.append(
+            ("(R)eject, accept (t)emporarily or accept (p)ermanently?", "p"),
+        )
+        ctx.job["config"].update(
+            {
+                "expect": expect
+            }
+        )
+
+        # Trusting the TLS cert requires interactive mode
+    else:
+
+        # If not needing to trust the TLS cert, then use non-interactive mode
+        cmd_svn_info += arg_svn_non_interactive
+
 
     # Common git command args
     arg_git                             = ["git", "-C", local_repo_path]
@@ -166,12 +192,14 @@ def _build_cli_commands(ctx: Context) -> dict:
 
     arg_git_svn                         = arg_git + ["svn"]
 
+
     # git commands
     cmd_git_default_branch              = arg_git     + ["symbolic-ref", "HEAD", f"refs/heads/{git_default_branch}"]
     cmd_git_garbage_collection          = arg_git     + ["gc"]
     cmd_git_svn_fetch                   = arg_git_svn + ["fetch", "--quiet"]
     cmd_git_svn_init                    = arg_git_svn + ["init"] + arg_repo_url
 
+
      # Add authentication, if provided
     if username:
         arg_username                    = ["--username", username]
@@ -183,25 +211,8 @@ def _build_cli_commands(ctx: Context) -> dict:
         arg_password                    = ["--password", password]
         cmd_svn_info                    += arg_password
 
-    # Skip TLS verification, if needed
-    if disable_tls_verification:
 
-        # This prompt only be required very rarely, ex. once per:
-            # Deployment of the repo-converter container, ex. the ~/.subversion/auth/svn.ssl.server directory inside the container is empty, as the root volume is not retained
-            # New Subversion server
-            # New TLS cert on a server
-        # However, it needs to be checked for on every job
-        expect = []
-        expect.append(
-            ("(R)eject, accept (t)emporarily or accept (p)ermanently?", "p"),
-        )
-        ctx.job["config"].update(
-            {
-                "expect": expect
-            }
-        )
-
-    # git svn commands
+    ## git svn commands
     if layout:
         cmd_git_svn_init                += ["--stdlayout"]
         # Warn the user if they provided an invalid value for the layout
@@ -227,6 +238,7 @@ def _build_cli_commands(ctx: Context) -> dict:
             for branch in branches:
                 cmd_git_svn_init        += ["--branches", branch]
 
+
     return {
         'cmd_git_default_branch':           cmd_git_default_branch,
         'cmd_git_garbage_collection':       cmd_git_garbage_collection,
@@ -518,10 +530,9 @@ def _initialize_git_repo(ctx: Context, commands: dict) -> None:
 
     # Get config values
     job_config          = ctx.job.get("config",{})
-    local_repo_path     = job_config.get("local_repo_path")
     bare_clone          = job_config.get("bare_clone")
+    local_repo_path     = job_config.get("local_repo_path")
     password            = job_config.get("password")
-    repo_key            = job_config.get("repo_key")
     cmd_git_svn_init    = commands["cmd_git_svn_init"]
 
     # If the directory does exist, then it failed the validation check, and needs to be destroyed and recreated