Skip to content

Commit f81f965

Browse files
bzweimkanoor
andauthored
fix: ensure tempfiles are closed (#885)
Co-authored-by: Madhu Kanoor <[email protected]>
1 parent 93d7517 commit f81f965

File tree

1 file changed

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

1 file changed

+5
-3
lines changed

src/aap_eda/services/project/scm.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ def clone(
142142
final_url = url
143143
secret = ""
144144
key_file = None
145+
key_password = None
145146
gpg_key_file = None
146147
if credential:
147148
inputs = inputs_from_store(credential.inputs.get_secret_value())
@@ -162,8 +163,6 @@ def clone(
162163
key_file.flush()
163164
extra_vars["key_file"] = key_file.name
164165
key_password = inputs.get("ssh_key_unlock")
165-
if key_password:
166-
cls.decrypt_key_file(key_file.name, key_password)
167166

168167
if gpg_credential:
169168
gpg_inputs = inputs_from_store(
@@ -175,7 +174,6 @@ def clone(
175174
gpg_key_file.write("\n")
176175
gpg_key_file.flush()
177176
extra_vars["verify_commit"] = "true"
178-
cls.add_gpg_key(gpg_key_file.name)
179177

180178
if not verify_ssl:
181179
extra_vars["ssl_no_verify"] = "true"
@@ -195,6 +193,10 @@ def clone(
195193

196194
logger.info("Cloning repository: %s", url)
197195
try:
196+
if key_password:
197+
cls.decrypt_key_file(key_file.name, key_password)
198+
if gpg_key_file:
199+
cls.add_gpg_key(gpg_key_file.name)
198200
with contextlib.chdir(path):
199201
git_hash = _executor(extra_vars=extra_vars, env_vars=env_vars)
200202
except ScmError as e:

0 commit comments

Comments
 (0)