File tree Expand file tree Collapse file tree 1 file changed +5
-3
lines changed
src/aap_eda/services/project Expand file tree Collapse file tree 1 file changed +5
-3
lines changed Original file line number Diff line number Diff line change @@ -142,6 +142,7 @@ def clone(
142
142
final_url = url
143
143
secret = ""
144
144
key_file = None
145
+ key_password = None
145
146
gpg_key_file = None
146
147
if credential :
147
148
inputs = inputs_from_store (credential .inputs .get_secret_value ())
@@ -162,8 +163,6 @@ def clone(
162
163
key_file .flush ()
163
164
extra_vars ["key_file" ] = key_file .name
164
165
key_password = inputs .get ("ssh_key_unlock" )
165
- if key_password :
166
- cls .decrypt_key_file (key_file .name , key_password )
167
166
168
167
if gpg_credential :
169
168
gpg_inputs = inputs_from_store (
@@ -175,7 +174,6 @@ def clone(
175
174
gpg_key_file .write ("\n " )
176
175
gpg_key_file .flush ()
177
176
extra_vars ["verify_commit" ] = "true"
178
- cls .add_gpg_key (gpg_key_file .name )
179
177
180
178
if not verify_ssl :
181
179
extra_vars ["ssl_no_verify" ] = "true"
@@ -195,6 +193,10 @@ def clone(
195
193
196
194
logger .info ("Cloning repository: %s" , url )
197
195
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 )
198
200
with contextlib .chdir (path ):
199
201
git_hash = _executor (extra_vars = extra_vars , env_vars = env_vars )
200
202
except ScmError as e :
You can’t perform that action at this time.
0 commit comments