External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-13 15:09:32 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fix for broken task-related tests.

Browse Source
This commit is contained in:
Chris Church
2013-09-30 22:29:10 -04:00
parent 17c350d7e1
commit 246503440a
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/main/tasks.py
View File

@@ -278,9 +278,7 @@ class RunJob(BaseTask):
'''
credential = getattr(job, 'credential', None)
if credential:
return decrypt_field(credential, 'ssh_key_data')
else:
return ''
return decrypt_field(credential, 'ssh_key_data') or None
def build_passwords(self, job, **kwargs):
'''
@@ -453,7 +451,7 @@ class RunProjectUpdate(BaseTask):
Return SSH private key data needed for this project update.
'''
project = project_update.project
return decrypt_field(project, 'scm_key_data')
return decrypt_field(project, 'scm_key_data') or None
def build_passwords(self, project_update, **kwargs):
'''