External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-16 10:40:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #158 from chrismeyersfsu/fix-credential_file

Browse Source 
return empty private data content rather than None for generate private ...
This commit is contained in:
Chris Meyers
2015-04-27 08:40:10 -04:00
parent 04340dcc27 b323e26b2f
commit f7355ae5f3
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/tasks.py
View File

@@ -768,7 +768,9 @@ class RunProjectUpdate(BaseTask):
''' '''
private_data = {} private_data = {}
if project_update.credential: if project_update.credential:
private_data['scm_credential'] = decrypt_field(project_update.credential, 'ssh_key_data') or None credential = project_update.credential
if credential.ssh_key_data not in (None, ''):
private_data['scm_credential'] = decrypt_field(project_update.credential, 'ssh_key_data')
return private_data return private_data
def build_passwords(self, project_update, **kwargs): def build_passwords(self, project_update, **kwargs):