svn: fix ssh subcommand type with missing space
This commit is contained in:
parent
849641a10a
commit
2f1aff604a
3 changed files with 19 additions and 8 deletions
|
|
@ -234,15 +234,22 @@ class SshWrapper(object):
|
|||
scm_detected, scm_repo, scm_mode = self.get_repo_details(mode)
|
||||
|
||||
log.debug(
|
||||
'Mode: `%s` User: `name:%s : id:%s` Shell: `%s` SSH Command: `"%s"` '
|
||||
"SCM_DETECTED: `%s` SCM Mode: `%s` SCM Repo: `%s`",
|
||||
""
|
||||
"mode:`%s` "
|
||||
"user_name:`%s`"
|
||||
"user_id:`%s`"
|
||||
"shell: `%s` "
|
||||
'ssh_command:`"%s"` '
|
||||
"scm_mode:`%s` "
|
||||
"scm_type:`%s` "
|
||||
"scm_repo_name:`%s`",
|
||||
mode,
|
||||
username,
|
||||
user_id,
|
||||
shell,
|
||||
self.command,
|
||||
scm_detected,
|
||||
scm_mode,
|
||||
scm_detected,
|
||||
scm_repo,
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -118,7 +118,7 @@ class SubversionTunnelWrapper(object):
|
|||
ra_client = self._svn_bytes(response["ra_client"])
|
||||
client = b" " + self._svn_bytes(response["client"]) or b""
|
||||
|
||||
buffer_ = b"( %b ( %b ) %b%b(%b) )" % (version, capabilities, url, ra_client, client)
|
||||
buffer_ = b"( %b ( %b ) %b%b(%b) )%b" % (version, capabilities, url, ra_client, client, b" ")
|
||||
return buffer_
|
||||
|
||||
def patch_first_client_response(self, response, **kwargs):
|
||||
|
|
|
|||
|
|
@ -117,13 +117,17 @@ def get_txn_id_from_store(repo_path, svn_txn_id, rm_on_read=False):
|
|||
data = {}
|
||||
redis_conn.get(store_key)
|
||||
raw_data = "not-set"
|
||||
|
||||
try:
|
||||
raw_data = redis_conn.get(store_key)
|
||||
if not raw_data:
|
||||
raise ValueError(f"Failed to get txn_id metadata, from store: {store_key}")
|
||||
data = json.loads(raw_data)
|
||||
if raw_data:
|
||||
data = json.loads(raw_data)
|
||||
except Exception:
|
||||
log.exception("Failed to get txn_id metadata: %s", raw_data)
|
||||
log.exception("Failed to get txn_id metadata: redis_conn=%s raw_data=%s", redis_conn, raw_data)
|
||||
|
||||
if not data:
|
||||
log.exception("Failed to get txn_id metadata: redis_conn=%s raw_data=%s", redis_conn, raw_data)
|
||||
raise ValueError(f"Failed to get txn_id metadata, from store: {store_key}")
|
||||
|
||||
if rm_on_read:
|
||||
log.debug("Cleaning up txn_id at %s", store_key)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue