Skip to content

Commit 8b2d498

Browse files
authored
fix: force a line end when recreate the ssh key file (#883)
1 parent 9c392cb commit 8b2d498

File tree

1 file changed

+3
-0
lines changed
  • src/aap_eda/services/project

1 file changed

+3
-0
lines changed

src/aap_eda/services/project/scm.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ def clone(
158158
if key_data: # ssh
159159
key_file = tempfile.NamedTemporaryFile("w+t")
160160
key_file.write(key_data)
161+
key_file.write("\n")
161162
key_file.flush()
162163
extra_vars["key_file"] = key_file.name
163164
key_password = inputs.get("ssh_key_unlock")
@@ -171,6 +172,7 @@ def clone(
171172
gpg_key = gpg_inputs.get("gpg_public_key")
172173
gpg_key_file = tempfile.NamedTemporaryFile("w+t")
173174
gpg_key_file.write(gpg_key)
175+
gpg_key_file.write("\n")
174176
gpg_key_file.flush()
175177
extra_vars["verify_commit"] = "true"
176178
cls.add_gpg_key(gpg_key_file.name)
@@ -199,6 +201,7 @@ def clone(
199201
msg = str(e)
200202
if secret:
201203
msg = msg.replace(secret, "****", 1)
204+
msg = msg.replace(quote(secret), "****", 1)
202205
logger.warning("SCM clone failed: %s", msg)
203206
raise ScmError(msg) from None
204207
finally:

0 commit comments

Comments
 (0)