External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-14 04:47:44 -02:30
Code Issues Packages Projects Releases Wiki Activity

fix bug with null credential

Browse Source
This commit is contained in:
AlanCoding
2019-05-08 21:18:16 -04:00
parent 1874e8bb4c
commit 7e6a73f892
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awx/main/tasks.py
View File

@@ -1079,7 +1079,7 @@ class BaseTask(object):
if status_data['status'] == 'starting': if status_data['status'] == 'starting':
job_env = dict(runner_config.env) job_env = dict(runner_config.env)
''' '''
Take the safe environment variables and overwrite Take the safe environment variables and overwrite
''' '''
for k, v in self.safe_env.items(): for k, v in self.safe_env.items():
if k in job_env: if k in job_env:
@@ -1685,8 +1685,12 @@ class RunProjectUpdate(BaseTask):
for authentication. for authentication.
''' '''
extra_vars = {} extra_vars = {}
scm_username = project_update.credential.get_input('username', default='') if project_update.credential:
scm_password = project_update.credential.get_input('password', default='') scm_username = project_update.credential.get_input('username', default='')
scm_password = project_update.credential.get_input('password', default='')
else:
scm_username = ''
scm_password = ''
scm_type = project_update.scm_type scm_type = project_update.scm_type
scm_url = update_scm_url(scm_type, project_update.scm_url, scm_url = update_scm_url(scm_type, project_update.scm_url,
check_special_cases=False) check_special_cases=False)